From dec5817059ff1b4cb8678e4b853f0dc14cd09594 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 001/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index 4721c6a2dd1b..948dcb68a23d 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,4 +1,5 @@ { + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", @@ -22,7 +23,7 @@ "advanced_options": { "clone_dir": "./src/github.com/Azure/azure-sdk-for-go", "sdk_generation_pull_request_base": "integration_branch", - "main_branch": "latest" + "create_sdk_pull_requests": true }, "version": "0.2.0" } From 2a38f5772fdf3a418baa225baaeeda8af1359b5b Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:28:11 -0700 Subject: [PATCH 002/558] Add *.zip to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 466ae88f24d2..bccadb649dfe 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ _testmain.go *.exe *.test *.prof +*.zip # Editor swap files *.swp From 0780ef35600bc865b9731acb606048c3955b5513 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 003/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 49b8f1c0d467c7aca6a9f641db0568988c2856ef Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 004/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 27689e718e1e..21de8a41510f 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index e191eb867583..259c4ff5042f 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 504a6cac16d5..58143c7b0919 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -263,8 +263,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -273,13 +271,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -383,25 +379,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -726,15 +703,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1324,17 +1292,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1350,10 +1316,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1366,10 +1328,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1410,11 +1368,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1430,11 +1383,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1449,7 +1397,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1471,11 +1419,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1491,11 +1434,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1506,67 +1444,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2210,7 +2087,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2232,11 +2109,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2252,11 +2124,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2635,7 +2502,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2657,11 +2524,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2677,11 +2539,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5119,7 +4976,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5141,11 +4998,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5161,11 +5013,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5193,78 +5040,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1976aaeef04b127d80db896b7d9c9f3a4ee6c612 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 005/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From d54900a64c95efa6934dac70abf02c31348d6d25 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 006/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 27689e718e1e..21de8a41510f 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index e191eb867583..259c4ff5042f 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 504a6cac16d5..58143c7b0919 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -263,8 +263,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -273,13 +271,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -383,25 +379,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -726,15 +703,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1324,17 +1292,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1350,10 +1316,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1366,10 +1328,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1410,11 +1368,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1430,11 +1383,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1449,7 +1397,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1471,11 +1419,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1491,11 +1434,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1506,67 +1444,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2210,7 +2087,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2232,11 +2109,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2252,11 +2124,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2635,7 +2502,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2657,11 +2524,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2677,11 +2539,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5119,7 +4976,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5141,11 +4998,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5161,11 +5013,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5193,78 +5040,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0511e4c5bb9e26ac342466b5761fb2ed7221790d Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 007/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 3be8cb2bb61d2c70a9f1219f6069a50d95a95095 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 008/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 27689e718e1e..21de8a41510f 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index e191eb867583..259c4ff5042f 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 504a6cac16d5..58143c7b0919 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -263,8 +263,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -273,13 +271,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -383,25 +379,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -726,15 +703,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1324,17 +1292,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1350,10 +1316,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1366,10 +1328,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1410,11 +1368,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1430,11 +1383,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1449,7 +1397,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1471,11 +1419,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1491,11 +1434,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1506,67 +1444,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2210,7 +2087,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2232,11 +2109,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2252,11 +2124,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2635,7 +2502,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2657,11 +2524,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2677,11 +2539,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5119,7 +4976,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5141,11 +4998,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5161,11 +5013,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5193,78 +5040,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8b7e5e74bad3160a3d838e69431952aa95a87d57 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 009/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 41 +- profiles/preview/cdn/mgmt/cdn/models.go | 41 +- services/cdn/mgmt/2019-04-15/cdn/models.go | 708 +++++++++++++++++++-- 3 files changed, 732 insertions(+), 58 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 21de8a41510f..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -52,6 +52,20 @@ const ( Shared CertificateType = original.Shared ) +type CookiesOperator = original.CookiesOperator + +const ( + Any CookiesOperator = original.Any + BeginsWith CookiesOperator = original.BeginsWith + Contains CookiesOperator = original.Contains + EndsWith CookiesOperator = original.EndsWith + Equal CookiesOperator = original.Equal + GreaterThan CookiesOperator = original.GreaterThan + GreaterThanOrEqual CookiesOperator = original.GreaterThanOrEqual + LessThan CookiesOperator = original.LessThan + LessThanOrEqual CookiesOperator = original.LessThanOrEqual +) + type CustomDomainResourceState = original.CustomDomainResourceState const ( @@ -122,7 +136,9 @@ const ( type Name = original.Name const ( + NameCookies Name = original.NameCookies NameDeliveryRuleCondition Name = original.NameDeliveryRuleCondition + NameHTTPVersion Name = original.NameHTTPVersion NameIsDevice Name = original.NameIsDevice NamePostArgs Name = original.NamePostArgs NameQueryString Name = original.NameQueryString @@ -168,15 +184,15 @@ const ( type PostArgsOperator = original.PostArgsOperator const ( - Any PostArgsOperator = original.Any - BeginsWith PostArgsOperator = original.BeginsWith - Contains PostArgsOperator = original.Contains - EndsWith PostArgsOperator = original.EndsWith - Equal PostArgsOperator = original.Equal - GreaterThan PostArgsOperator = original.GreaterThan - GreaterThanOrEqual PostArgsOperator = original.GreaterThanOrEqual - LessThan PostArgsOperator = original.LessThan - LessThanOrEqual PostArgsOperator = original.LessThanOrEqual + PostArgsOperatorAny PostArgsOperator = original.PostArgsOperatorAny + PostArgsOperatorBeginsWith PostArgsOperator = original.PostArgsOperatorBeginsWith + PostArgsOperatorContains PostArgsOperator = original.PostArgsOperatorContains + PostArgsOperatorEndsWith PostArgsOperator = original.PostArgsOperatorEndsWith + PostArgsOperatorEqual PostArgsOperator = original.PostArgsOperatorEqual + PostArgsOperatorGreaterThan PostArgsOperator = original.PostArgsOperatorGreaterThan + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = original.PostArgsOperatorGreaterThanOrEqual + PostArgsOperatorLessThan PostArgsOperator = original.PostArgsOperatorLessThan + PostArgsOperatorLessThanOrEqual PostArgsOperator = original.PostArgsOperatorLessThanOrEqual ) type ProfileResourceState = original.ProfileResourceState @@ -354,6 +370,7 @@ type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput type CidrIPAddress = original.CidrIPAddress +type CookiesMatchConditionParameters = original.CookiesMatchConditionParameters type CustomDomain = original.CustomDomain type CustomDomainHTTPSParameters = original.CustomDomainHTTPSParameters type CustomDomainListResult = original.CustomDomainListResult @@ -371,6 +388,8 @@ type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction type DeliveryRuleCondition = original.DeliveryRuleCondition +type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition +type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition type DeliveryRuleQueryStringCondition = original.DeliveryRuleQueryStringCondition @@ -409,6 +428,7 @@ type EndpointsStopFuture = original.EndpointsStopFuture type EndpointsUpdateFuture = original.EndpointsUpdateFuture type ErrorResponse = original.ErrorResponse type GeoFilter = original.GeoFilter +type HTTPVersionMatchConditionParameters = original.HTTPVersionMatchConditionParameters type HeaderActionParameters = original.HeaderActionParameters type IPAddressGroup = original.IPAddressGroup type IsDeviceMatchConditionParameters = original.IsDeviceMatchConditionParameters @@ -570,6 +590,9 @@ func PossibleCertificateSourceValues() []CertificateSource { func PossibleCertificateTypeValues() []CertificateType { return original.PossibleCertificateTypeValues() } +func PossibleCookiesOperatorValues() []CookiesOperator { + return original.PossibleCookiesOperatorValues() +} func PossibleCustomDomainResourceStateValues() []CustomDomainResourceState { return original.PossibleCustomDomainResourceStateValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 259c4ff5042f..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -52,6 +52,20 @@ const ( Shared CertificateType = original.Shared ) +type CookiesOperator = original.CookiesOperator + +const ( + Any CookiesOperator = original.Any + BeginsWith CookiesOperator = original.BeginsWith + Contains CookiesOperator = original.Contains + EndsWith CookiesOperator = original.EndsWith + Equal CookiesOperator = original.Equal + GreaterThan CookiesOperator = original.GreaterThan + GreaterThanOrEqual CookiesOperator = original.GreaterThanOrEqual + LessThan CookiesOperator = original.LessThan + LessThanOrEqual CookiesOperator = original.LessThanOrEqual +) + type CustomDomainResourceState = original.CustomDomainResourceState const ( @@ -122,7 +136,9 @@ const ( type Name = original.Name const ( + NameCookies Name = original.NameCookies NameDeliveryRuleCondition Name = original.NameDeliveryRuleCondition + NameHTTPVersion Name = original.NameHTTPVersion NameIsDevice Name = original.NameIsDevice NamePostArgs Name = original.NamePostArgs NameQueryString Name = original.NameQueryString @@ -168,15 +184,15 @@ const ( type PostArgsOperator = original.PostArgsOperator const ( - Any PostArgsOperator = original.Any - BeginsWith PostArgsOperator = original.BeginsWith - Contains PostArgsOperator = original.Contains - EndsWith PostArgsOperator = original.EndsWith - Equal PostArgsOperator = original.Equal - GreaterThan PostArgsOperator = original.GreaterThan - GreaterThanOrEqual PostArgsOperator = original.GreaterThanOrEqual - LessThan PostArgsOperator = original.LessThan - LessThanOrEqual PostArgsOperator = original.LessThanOrEqual + PostArgsOperatorAny PostArgsOperator = original.PostArgsOperatorAny + PostArgsOperatorBeginsWith PostArgsOperator = original.PostArgsOperatorBeginsWith + PostArgsOperatorContains PostArgsOperator = original.PostArgsOperatorContains + PostArgsOperatorEndsWith PostArgsOperator = original.PostArgsOperatorEndsWith + PostArgsOperatorEqual PostArgsOperator = original.PostArgsOperatorEqual + PostArgsOperatorGreaterThan PostArgsOperator = original.PostArgsOperatorGreaterThan + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = original.PostArgsOperatorGreaterThanOrEqual + PostArgsOperatorLessThan PostArgsOperator = original.PostArgsOperatorLessThan + PostArgsOperatorLessThanOrEqual PostArgsOperator = original.PostArgsOperatorLessThanOrEqual ) type ProfileResourceState = original.ProfileResourceState @@ -354,6 +370,7 @@ type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput type CidrIPAddress = original.CidrIPAddress +type CookiesMatchConditionParameters = original.CookiesMatchConditionParameters type CustomDomain = original.CustomDomain type CustomDomainHTTPSParameters = original.CustomDomainHTTPSParameters type CustomDomainListResult = original.CustomDomainListResult @@ -371,6 +388,8 @@ type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction type DeliveryRuleCondition = original.DeliveryRuleCondition +type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition +type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition type DeliveryRuleQueryStringCondition = original.DeliveryRuleQueryStringCondition @@ -409,6 +428,7 @@ type EndpointsStopFuture = original.EndpointsStopFuture type EndpointsUpdateFuture = original.EndpointsUpdateFuture type ErrorResponse = original.ErrorResponse type GeoFilter = original.GeoFilter +type HTTPVersionMatchConditionParameters = original.HTTPVersionMatchConditionParameters type HeaderActionParameters = original.HeaderActionParameters type IPAddressGroup = original.IPAddressGroup type IsDeviceMatchConditionParameters = original.IsDeviceMatchConditionParameters @@ -570,6 +590,9 @@ func PossibleCertificateSourceValues() []CertificateSource { func PossibleCertificateTypeValues() []CertificateType { return original.PossibleCertificateTypeValues() } +func PossibleCookiesOperatorValues() []CookiesOperator { + return original.PossibleCookiesOperatorValues() +} func PossibleCustomDomainResourceStateValues() []CustomDomainResourceState { return original.PossibleCustomDomainResourceStateValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 58143c7b0919..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -79,6 +79,35 @@ func PossibleCertificateTypeValues() []CertificateType { return []CertificateType{Dedicated, Shared} } +// 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" +) + +// 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} +} + // CustomDomainResourceState enumerates the values for custom domain resource state. type CustomDomainResourceState string @@ -224,8 +253,12 @@ func PossibleHeaderActionValues() []HeaderAction { type Name string const ( + // NameCookies ... + NameCookies Name = "Cookies" // NameDeliveryRuleCondition ... NameDeliveryRuleCondition Name = "DeliveryRuleCondition" + // NameHTTPVersion ... + NameHTTPVersion Name = "HttpVersion" // NameIsDevice ... NameIsDevice Name = "IsDevice" // NamePostArgs ... @@ -254,7 +287,7 @@ const ( // PossibleNameValues returns an array of possible values for the Name const type. func PossibleNameValues() []Name { - return []Name{NameDeliveryRuleCondition, NameIsDevice, NamePostArgs, NameQueryString, NameRemoteAddress, NameRequestBody, NameRequestHeader, NameRequestMethod, NameRequestScheme, NameRequestURI, NameURLFileExtension, NameURLFileName, NameURLPath} + return []Name{NameCookies, NameDeliveryRuleCondition, NameHTTPVersion, NameIsDevice, NamePostArgs, NameQueryString, NameRemoteAddress, NameRequestBody, NameRequestHeader, NameRequestMethod, NameRequestScheme, NameRequestURI, NameURLFileExtension, NameURLFileName, NameURLPath} } // NameBasicDeliveryRuleAction enumerates the values for name basic delivery rule action. @@ -263,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -271,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -320,29 +357,29 @@ func PossibleOriginResourceStateValues() []OriginResourceState { type PostArgsOperator string const ( - // Any ... - Any PostArgsOperator = "Any" - // BeginsWith ... - BeginsWith PostArgsOperator = "BeginsWith" - // Contains ... - Contains PostArgsOperator = "Contains" - // EndsWith ... - EndsWith PostArgsOperator = "EndsWith" - // Equal ... - Equal PostArgsOperator = "Equal" - // GreaterThan ... - GreaterThan PostArgsOperator = "GreaterThan" - // GreaterThanOrEqual ... - GreaterThanOrEqual PostArgsOperator = "GreaterThanOrEqual" - // LessThan ... - LessThan PostArgsOperator = "LessThan" - // LessThanOrEqual ... - LessThanOrEqual PostArgsOperator = "LessThanOrEqual" + // PostArgsOperatorAny ... + PostArgsOperatorAny PostArgsOperator = "Any" + // PostArgsOperatorBeginsWith ... + PostArgsOperatorBeginsWith PostArgsOperator = "BeginsWith" + // PostArgsOperatorContains ... + PostArgsOperatorContains PostArgsOperator = "Contains" + // PostArgsOperatorEndsWith ... + PostArgsOperatorEndsWith PostArgsOperator = "EndsWith" + // PostArgsOperatorEqual ... + PostArgsOperatorEqual PostArgsOperator = "Equal" + // PostArgsOperatorGreaterThan ... + PostArgsOperatorGreaterThan PostArgsOperator = "GreaterThan" + // PostArgsOperatorGreaterThanOrEqual ... + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = "GreaterThanOrEqual" + // PostArgsOperatorLessThan ... + PostArgsOperatorLessThan PostArgsOperator = "LessThan" + // PostArgsOperatorLessThanOrEqual ... + PostArgsOperatorLessThanOrEqual PostArgsOperator = "LessThanOrEqual" ) // PossiblePostArgsOperatorValues returns an array of possible values for the PostArgsOperator const type. func PossiblePostArgsOperatorValues() []PostArgsOperator { - return []PostArgsOperator{Any, BeginsWith, Contains, EndsWith, Equal, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual} + return []PostArgsOperator{PostArgsOperatorAny, PostArgsOperatorBeginsWith, PostArgsOperatorContains, PostArgsOperatorEndsWith, PostArgsOperatorEqual, PostArgsOperatorGreaterThan, PostArgsOperatorGreaterThanOrEqual, PostArgsOperatorLessThan, PostArgsOperatorLessThanOrEqual} } // ProfileResourceState enumerates the values for profile resource state. @@ -379,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -703,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -738,6 +803,21 @@ type CidrIPAddress struct { PrefixLength *int32 `json:"prefixLength,omitempty"` } +// CookiesMatchConditionParameters defines the parameters for Cookies match conditions +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' + Operator CookiesOperator `json:"operator,omitempty"` + // NegateCondition - Describes if this is negate condition or not + NegateCondition *bool `json:"negateCondition,omitempty"` + // MatchValues - The match value for the condition of the delivery rule + MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` +} + // CustomDomain friendly domain name mapping to the endpoint hostname that the customer provides for // branding purposes, e.g. www.contoso.com. type CustomDomain struct { @@ -1292,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1316,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1328,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1368,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1383,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1397,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1419,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1434,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1444,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -1457,13 +1628,15 @@ type BasicDeliveryRuleCondition interface { AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) + AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) + AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) } // DeliveryRuleCondition a condition for the delivery rule. type DeliveryRuleCondition struct { - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1519,6 +1692,14 @@ func unmarshalBasicDeliveryRuleCondition(body []byte) (BasicDeliveryRuleConditio var drufnc DeliveryRuleURLFileNameCondition err := json.Unmarshal(body, &drufnc) return drufnc, err + case string(NameHTTPVersion): + var drhvc DeliveryRuleHTTPVersionCondition + err := json.Unmarshal(body, &drhvc) + return drhvc, err + case string(NameCookies): + var drcc DeliveryRuleCookiesCondition + err := json.Unmarshal(body, &drcc) + return drcc, err case string(NameIsDevice): var dridc DeliveryRuleIsDeviceCondition err := json.Unmarshal(body, &dridc) @@ -1613,6 +1794,16 @@ func (drc DeliveryRuleCondition) AsDeliveryRuleURLFileNameCondition() (*Delivery return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. +func (drc DeliveryRuleCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. +func (drc DeliveryRuleCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. func (drc DeliveryRuleCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1628,11 +1819,213 @@ func (drc DeliveryRuleCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRu return &drc, true } +// DeliveryRuleCookiesCondition defines the Cookies condition for the delivery rule. +type DeliveryRuleCookiesCondition struct { + // Parameters - Defines the parameters for the condition. + Parameters *CookiesMatchConditionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' + Name Name `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) MarshalJSON() ([]byte, error) { + drcc.Name = NameCookies + objectMap := make(map[string]interface{}) + if drcc.Parameters != nil { + objectMap["parameters"] = drcc.Parameters + } + if drcc.Name != "" { + objectMap["name"] = drcc.Name + } + return json.Marshal(objectMap) +} + +// AsDeliveryRuleRemoteAddressCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestMethodCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestMethodCondition() (*DeliveryRuleRequestMethodCondition, bool) { + return nil, false +} + +// AsDeliveryRuleQueryStringCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleQueryStringCondition() (*DeliveryRuleQueryStringCondition, bool) { + return nil, false +} + +// AsDeliveryRulePostArgsCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRulePostArgsCondition() (*DeliveryRulePostArgsCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestURICondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestURICondition() (*DeliveryRuleRequestURICondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestHeaderCondition() (*DeliveryRuleRequestHeaderCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestBodyCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestBodyCondition() (*DeliveryRuleRequestBodyCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestSchemeCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestSchemeCondition() (*DeliveryRuleRequestSchemeCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLPathCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileExtensionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileNameCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) { + return nil, false +} + +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return &drcc, true +} + +// AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) { + return nil, false +} + +// AsBasicDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRuleCondition, bool) { + return &drcc, true +} + +// DeliveryRuleHTTPVersionCondition defines the HttpVersion condition for the delivery rule. +type DeliveryRuleHTTPVersionCondition struct { + // Parameters - Defines the parameters for the condition. + Parameters *HTTPVersionMatchConditionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' + Name Name `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) MarshalJSON() ([]byte, error) { + drhvc.Name = NameHTTPVersion + objectMap := make(map[string]interface{}) + if drhvc.Parameters != nil { + objectMap["parameters"] = drhvc.Parameters + } + if drhvc.Name != "" { + objectMap["name"] = drhvc.Name + } + return json.Marshal(objectMap) +} + +// AsDeliveryRuleRemoteAddressCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestMethodCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestMethodCondition() (*DeliveryRuleRequestMethodCondition, bool) { + return nil, false +} + +// AsDeliveryRuleQueryStringCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleQueryStringCondition() (*DeliveryRuleQueryStringCondition, bool) { + return nil, false +} + +// AsDeliveryRulePostArgsCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRulePostArgsCondition() (*DeliveryRulePostArgsCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestURICondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestURICondition() (*DeliveryRuleRequestURICondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestHeaderCondition() (*DeliveryRuleRequestHeaderCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestBodyCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestBodyCondition() (*DeliveryRuleRequestBodyCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestSchemeCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestSchemeCondition() (*DeliveryRuleRequestSchemeCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLPathCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileExtensionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileNameCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) { + return nil, false +} + +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return &drhvc, true +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + +// AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) { + return nil, false +} + +// AsBasicDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRuleCondition, bool) { + return &drhvc, true +} + // DeliveryRuleIsDeviceCondition defines the IsDevice condition for the delivery rule. type DeliveryRuleIsDeviceCondition struct { // Parameters - Defines the parameters for the condition. Parameters *IsDeviceMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1704,6 +2097,16 @@ func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleURLFileNameCondition() return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. +func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. +func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return &dridc, true @@ -1723,7 +2126,7 @@ func (dridc DeliveryRuleIsDeviceCondition) AsBasicDeliveryRuleCondition() (Basic type DeliveryRulePostArgsCondition struct { // Parameters - Defines the parameters for the condition. Parameters *PostArgsMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1795,6 +2198,16 @@ func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleURLFileNameCondition() return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. +func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. +func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1814,7 +2227,7 @@ func (drpac DeliveryRulePostArgsCondition) AsBasicDeliveryRuleCondition() (Basic type DeliveryRuleQueryStringCondition struct { // Parameters - Defines the parameters for the condition. Parameters *QueryStringMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1886,6 +2299,16 @@ func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleURLFileNameCondition return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. +func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. +func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1905,7 +2328,7 @@ func (drqsc DeliveryRuleQueryStringCondition) AsBasicDeliveryRuleCondition() (Ba type DeliveryRuleRemoteAddressCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RemoteAddressMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1977,6 +2400,16 @@ func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. +func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. +func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1996,7 +2429,7 @@ func (drrac DeliveryRuleRemoteAddressCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestBodyCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestBodyMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2068,6 +2501,16 @@ func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleURLFileNameCondition return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. +func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. +func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2087,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2109,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2124,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2138,7 +2591,7 @@ func (drrha DeliveryRuleRequestHeaderAction) AsBasicDeliveryRuleAction() (BasicD type DeliveryRuleRequestHeaderCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestHeaderMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2210,6 +2663,16 @@ func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. +func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. +func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2229,7 +2692,7 @@ func (drrhc DeliveryRuleRequestHeaderCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestMethodCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestMethodMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2301,6 +2764,16 @@ func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. +func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. +func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2320,7 +2793,7 @@ func (drrmc DeliveryRuleRequestMethodCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestSchemeCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestSchemeMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2392,6 +2865,16 @@ func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. +func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. +func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2411,7 +2894,7 @@ func (drrsc DeliveryRuleRequestSchemeCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestURICondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestURIMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2483,6 +2966,16 @@ func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleURLFileNameCondition( return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. +func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. +func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2502,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2524,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2539,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2553,7 +3056,7 @@ func (drrha DeliveryRuleResponseHeaderAction) AsBasicDeliveryRuleAction() (Basic type DeliveryRuleURLFileExtensionCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLFileExtensionMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2625,6 +3128,16 @@ func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleURLFileNameCon return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. +func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. +func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2644,7 +3157,7 @@ func (drufec DeliveryRuleURLFileExtensionCondition) AsBasicDeliveryRuleCondition type DeliveryRuleURLFileNameCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLFileNameMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2716,6 +3229,16 @@ func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleURLFileNameConditio return &drufnc, true } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. +func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. +func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2735,7 +3258,7 @@ func (drufnc DeliveryRuleURLFileNameCondition) AsBasicDeliveryRuleCondition() (B type DeliveryRuleURLPathCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLPathMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2807,6 +3330,16 @@ func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleURLFileNameCondition() ( return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. +func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. +func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -3631,6 +4164,19 @@ type HeaderActionParameters struct { Value *string `json:"value,omitempty"` } +// HTTPVersionMatchConditionParameters defines the parameters for HttpVersion match conditions +type HTTPVersionMatchConditionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // Operator - Describes operator to be matched + Operator *string `json:"operator,omitempty"` + // NegateCondition - Describes if this is negate condition or not + NegateCondition *bool `json:"negateCondition,omitempty"` + // MatchValues - The match value for the condition of the delivery rule + MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` +} + // IPAddressGroup CDN Ip address group type IPAddressGroup struct { // DeliveryRegion - The delivery region of the ip address group @@ -4237,7 +4783,7 @@ type PostArgsMatchConditionParameters struct { OdataType *string `json:"@odata.type,omitempty"` // Selector - Name of PostArg 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' + // Operator - Describes operator to be matched. Possible values include: 'PostArgsOperatorAny', 'PostArgsOperatorEqual', 'PostArgsOperatorContains', 'PostArgsOperatorBeginsWith', 'PostArgsOperatorEndsWith', 'PostArgsOperatorLessThan', 'PostArgsOperatorLessThanOrEqual', 'PostArgsOperatorGreaterThan', 'PostArgsOperatorGreaterThanOrEqual' Operator PostArgsOperator `json:"operator,omitempty"` // NegateCondition - Describes if this is negate condition or not NegateCondition *bool `json:"negateCondition,omitempty"` @@ -4976,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -4998,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5013,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5040,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 270889ae4317961dd2a119afb27a7b79f35e6fa2 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 010/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 83ff96b73cf995b594a71ca56fd5398954aa40d7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 011/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 27689e718e1e..21de8a41510f 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index e191eb867583..259c4ff5042f 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -141,12 +141,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -197,15 +195,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -361,7 +350,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -382,7 +370,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition @@ -478,8 +465,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -627,9 +612,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 504a6cac16d5..58143c7b0919 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -263,8 +263,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -273,13 +271,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -383,25 +379,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -726,15 +703,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1324,17 +1292,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1350,10 +1316,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1366,10 +1328,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1410,11 +1368,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1430,11 +1383,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1449,7 +1397,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1471,11 +1419,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1491,11 +1434,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1506,67 +1444,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2210,7 +2087,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2232,11 +2109,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2252,11 +2124,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2635,7 +2502,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2657,11 +2524,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2677,11 +2539,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5119,7 +4976,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5141,11 +4998,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5161,11 +5013,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5193,78 +5040,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5e9e9e3ef9c7d134fb84ec9e4216fb79148f9ed5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 012/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 41 +- profiles/preview/cdn/mgmt/cdn/models.go | 41 +- services/cdn/mgmt/2019-04-15/cdn/models.go | 708 +++++++++++++++++++-- 3 files changed, 732 insertions(+), 58 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 21de8a41510f..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -52,6 +52,20 @@ const ( Shared CertificateType = original.Shared ) +type CookiesOperator = original.CookiesOperator + +const ( + Any CookiesOperator = original.Any + BeginsWith CookiesOperator = original.BeginsWith + Contains CookiesOperator = original.Contains + EndsWith CookiesOperator = original.EndsWith + Equal CookiesOperator = original.Equal + GreaterThan CookiesOperator = original.GreaterThan + GreaterThanOrEqual CookiesOperator = original.GreaterThanOrEqual + LessThan CookiesOperator = original.LessThan + LessThanOrEqual CookiesOperator = original.LessThanOrEqual +) + type CustomDomainResourceState = original.CustomDomainResourceState const ( @@ -122,7 +136,9 @@ const ( type Name = original.Name const ( + NameCookies Name = original.NameCookies NameDeliveryRuleCondition Name = original.NameDeliveryRuleCondition + NameHTTPVersion Name = original.NameHTTPVersion NameIsDevice Name = original.NameIsDevice NamePostArgs Name = original.NamePostArgs NameQueryString Name = original.NameQueryString @@ -168,15 +184,15 @@ const ( type PostArgsOperator = original.PostArgsOperator const ( - Any PostArgsOperator = original.Any - BeginsWith PostArgsOperator = original.BeginsWith - Contains PostArgsOperator = original.Contains - EndsWith PostArgsOperator = original.EndsWith - Equal PostArgsOperator = original.Equal - GreaterThan PostArgsOperator = original.GreaterThan - GreaterThanOrEqual PostArgsOperator = original.GreaterThanOrEqual - LessThan PostArgsOperator = original.LessThan - LessThanOrEqual PostArgsOperator = original.LessThanOrEqual + PostArgsOperatorAny PostArgsOperator = original.PostArgsOperatorAny + PostArgsOperatorBeginsWith PostArgsOperator = original.PostArgsOperatorBeginsWith + PostArgsOperatorContains PostArgsOperator = original.PostArgsOperatorContains + PostArgsOperatorEndsWith PostArgsOperator = original.PostArgsOperatorEndsWith + PostArgsOperatorEqual PostArgsOperator = original.PostArgsOperatorEqual + PostArgsOperatorGreaterThan PostArgsOperator = original.PostArgsOperatorGreaterThan + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = original.PostArgsOperatorGreaterThanOrEqual + PostArgsOperatorLessThan PostArgsOperator = original.PostArgsOperatorLessThan + PostArgsOperatorLessThanOrEqual PostArgsOperator = original.PostArgsOperatorLessThanOrEqual ) type ProfileResourceState = original.ProfileResourceState @@ -354,6 +370,7 @@ type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput type CidrIPAddress = original.CidrIPAddress +type CookiesMatchConditionParameters = original.CookiesMatchConditionParameters type CustomDomain = original.CustomDomain type CustomDomainHTTPSParameters = original.CustomDomainHTTPSParameters type CustomDomainListResult = original.CustomDomainListResult @@ -371,6 +388,8 @@ type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction type DeliveryRuleCondition = original.DeliveryRuleCondition +type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition +type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition type DeliveryRuleQueryStringCondition = original.DeliveryRuleQueryStringCondition @@ -409,6 +428,7 @@ type EndpointsStopFuture = original.EndpointsStopFuture type EndpointsUpdateFuture = original.EndpointsUpdateFuture type ErrorResponse = original.ErrorResponse type GeoFilter = original.GeoFilter +type HTTPVersionMatchConditionParameters = original.HTTPVersionMatchConditionParameters type HeaderActionParameters = original.HeaderActionParameters type IPAddressGroup = original.IPAddressGroup type IsDeviceMatchConditionParameters = original.IsDeviceMatchConditionParameters @@ -570,6 +590,9 @@ func PossibleCertificateSourceValues() []CertificateSource { func PossibleCertificateTypeValues() []CertificateType { return original.PossibleCertificateTypeValues() } +func PossibleCookiesOperatorValues() []CookiesOperator { + return original.PossibleCookiesOperatorValues() +} func PossibleCustomDomainResourceStateValues() []CustomDomainResourceState { return original.PossibleCustomDomainResourceStateValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 259c4ff5042f..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -52,6 +52,20 @@ const ( Shared CertificateType = original.Shared ) +type CookiesOperator = original.CookiesOperator + +const ( + Any CookiesOperator = original.Any + BeginsWith CookiesOperator = original.BeginsWith + Contains CookiesOperator = original.Contains + EndsWith CookiesOperator = original.EndsWith + Equal CookiesOperator = original.Equal + GreaterThan CookiesOperator = original.GreaterThan + GreaterThanOrEqual CookiesOperator = original.GreaterThanOrEqual + LessThan CookiesOperator = original.LessThan + LessThanOrEqual CookiesOperator = original.LessThanOrEqual +) + type CustomDomainResourceState = original.CustomDomainResourceState const ( @@ -122,7 +136,9 @@ const ( type Name = original.Name const ( + NameCookies Name = original.NameCookies NameDeliveryRuleCondition Name = original.NameDeliveryRuleCondition + NameHTTPVersion Name = original.NameHTTPVersion NameIsDevice Name = original.NameIsDevice NamePostArgs Name = original.NamePostArgs NameQueryString Name = original.NameQueryString @@ -168,15 +184,15 @@ const ( type PostArgsOperator = original.PostArgsOperator const ( - Any PostArgsOperator = original.Any - BeginsWith PostArgsOperator = original.BeginsWith - Contains PostArgsOperator = original.Contains - EndsWith PostArgsOperator = original.EndsWith - Equal PostArgsOperator = original.Equal - GreaterThan PostArgsOperator = original.GreaterThan - GreaterThanOrEqual PostArgsOperator = original.GreaterThanOrEqual - LessThan PostArgsOperator = original.LessThan - LessThanOrEqual PostArgsOperator = original.LessThanOrEqual + PostArgsOperatorAny PostArgsOperator = original.PostArgsOperatorAny + PostArgsOperatorBeginsWith PostArgsOperator = original.PostArgsOperatorBeginsWith + PostArgsOperatorContains PostArgsOperator = original.PostArgsOperatorContains + PostArgsOperatorEndsWith PostArgsOperator = original.PostArgsOperatorEndsWith + PostArgsOperatorEqual PostArgsOperator = original.PostArgsOperatorEqual + PostArgsOperatorGreaterThan PostArgsOperator = original.PostArgsOperatorGreaterThan + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = original.PostArgsOperatorGreaterThanOrEqual + PostArgsOperatorLessThan PostArgsOperator = original.PostArgsOperatorLessThan + PostArgsOperatorLessThanOrEqual PostArgsOperator = original.PostArgsOperatorLessThanOrEqual ) type ProfileResourceState = original.ProfileResourceState @@ -354,6 +370,7 @@ type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput type CidrIPAddress = original.CidrIPAddress +type CookiesMatchConditionParameters = original.CookiesMatchConditionParameters type CustomDomain = original.CustomDomain type CustomDomainHTTPSParameters = original.CustomDomainHTTPSParameters type CustomDomainListResult = original.CustomDomainListResult @@ -371,6 +388,8 @@ type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction type DeliveryRuleCondition = original.DeliveryRuleCondition +type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition +type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition type DeliveryRuleIsDeviceCondition = original.DeliveryRuleIsDeviceCondition type DeliveryRulePostArgsCondition = original.DeliveryRulePostArgsCondition type DeliveryRuleQueryStringCondition = original.DeliveryRuleQueryStringCondition @@ -409,6 +428,7 @@ type EndpointsStopFuture = original.EndpointsStopFuture type EndpointsUpdateFuture = original.EndpointsUpdateFuture type ErrorResponse = original.ErrorResponse type GeoFilter = original.GeoFilter +type HTTPVersionMatchConditionParameters = original.HTTPVersionMatchConditionParameters type HeaderActionParameters = original.HeaderActionParameters type IPAddressGroup = original.IPAddressGroup type IsDeviceMatchConditionParameters = original.IsDeviceMatchConditionParameters @@ -570,6 +590,9 @@ func PossibleCertificateSourceValues() []CertificateSource { func PossibleCertificateTypeValues() []CertificateType { return original.PossibleCertificateTypeValues() } +func PossibleCookiesOperatorValues() []CookiesOperator { + return original.PossibleCookiesOperatorValues() +} func PossibleCustomDomainResourceStateValues() []CustomDomainResourceState { return original.PossibleCustomDomainResourceStateValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 58143c7b0919..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -79,6 +79,35 @@ func PossibleCertificateTypeValues() []CertificateType { return []CertificateType{Dedicated, Shared} } +// 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" +) + +// 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} +} + // CustomDomainResourceState enumerates the values for custom domain resource state. type CustomDomainResourceState string @@ -224,8 +253,12 @@ func PossibleHeaderActionValues() []HeaderAction { type Name string const ( + // NameCookies ... + NameCookies Name = "Cookies" // NameDeliveryRuleCondition ... NameDeliveryRuleCondition Name = "DeliveryRuleCondition" + // NameHTTPVersion ... + NameHTTPVersion Name = "HttpVersion" // NameIsDevice ... NameIsDevice Name = "IsDevice" // NamePostArgs ... @@ -254,7 +287,7 @@ const ( // PossibleNameValues returns an array of possible values for the Name const type. func PossibleNameValues() []Name { - return []Name{NameDeliveryRuleCondition, NameIsDevice, NamePostArgs, NameQueryString, NameRemoteAddress, NameRequestBody, NameRequestHeader, NameRequestMethod, NameRequestScheme, NameRequestURI, NameURLFileExtension, NameURLFileName, NameURLPath} + return []Name{NameCookies, NameDeliveryRuleCondition, NameHTTPVersion, NameIsDevice, NamePostArgs, NameQueryString, NameRemoteAddress, NameRequestBody, NameRequestHeader, NameRequestMethod, NameRequestScheme, NameRequestURI, NameURLFileExtension, NameURLFileName, NameURLPath} } // NameBasicDeliveryRuleAction enumerates the values for name basic delivery rule action. @@ -263,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -271,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -320,29 +357,29 @@ func PossibleOriginResourceStateValues() []OriginResourceState { type PostArgsOperator string const ( - // Any ... - Any PostArgsOperator = "Any" - // BeginsWith ... - BeginsWith PostArgsOperator = "BeginsWith" - // Contains ... - Contains PostArgsOperator = "Contains" - // EndsWith ... - EndsWith PostArgsOperator = "EndsWith" - // Equal ... - Equal PostArgsOperator = "Equal" - // GreaterThan ... - GreaterThan PostArgsOperator = "GreaterThan" - // GreaterThanOrEqual ... - GreaterThanOrEqual PostArgsOperator = "GreaterThanOrEqual" - // LessThan ... - LessThan PostArgsOperator = "LessThan" - // LessThanOrEqual ... - LessThanOrEqual PostArgsOperator = "LessThanOrEqual" + // PostArgsOperatorAny ... + PostArgsOperatorAny PostArgsOperator = "Any" + // PostArgsOperatorBeginsWith ... + PostArgsOperatorBeginsWith PostArgsOperator = "BeginsWith" + // PostArgsOperatorContains ... + PostArgsOperatorContains PostArgsOperator = "Contains" + // PostArgsOperatorEndsWith ... + PostArgsOperatorEndsWith PostArgsOperator = "EndsWith" + // PostArgsOperatorEqual ... + PostArgsOperatorEqual PostArgsOperator = "Equal" + // PostArgsOperatorGreaterThan ... + PostArgsOperatorGreaterThan PostArgsOperator = "GreaterThan" + // PostArgsOperatorGreaterThanOrEqual ... + PostArgsOperatorGreaterThanOrEqual PostArgsOperator = "GreaterThanOrEqual" + // PostArgsOperatorLessThan ... + PostArgsOperatorLessThan PostArgsOperator = "LessThan" + // PostArgsOperatorLessThanOrEqual ... + PostArgsOperatorLessThanOrEqual PostArgsOperator = "LessThanOrEqual" ) // PossiblePostArgsOperatorValues returns an array of possible values for the PostArgsOperator const type. func PossiblePostArgsOperatorValues() []PostArgsOperator { - return []PostArgsOperator{Any, BeginsWith, Contains, EndsWith, Equal, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual} + return []PostArgsOperator{PostArgsOperatorAny, PostArgsOperatorBeginsWith, PostArgsOperatorContains, PostArgsOperatorEndsWith, PostArgsOperatorEqual, PostArgsOperatorGreaterThan, PostArgsOperatorGreaterThanOrEqual, PostArgsOperatorLessThan, PostArgsOperatorLessThanOrEqual} } // ProfileResourceState enumerates the values for profile resource state. @@ -379,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -703,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -738,6 +803,21 @@ type CidrIPAddress struct { PrefixLength *int32 `json:"prefixLength,omitempty"` } +// CookiesMatchConditionParameters defines the parameters for Cookies match conditions +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' + Operator CookiesOperator `json:"operator,omitempty"` + // NegateCondition - Describes if this is negate condition or not + NegateCondition *bool `json:"negateCondition,omitempty"` + // MatchValues - The match value for the condition of the delivery rule + MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` +} + // CustomDomain friendly domain name mapping to the endpoint hostname that the customer provides for // branding purposes, e.g. www.contoso.com. type CustomDomain struct { @@ -1292,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1316,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1328,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1368,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1383,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1397,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1419,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1434,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1444,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -1457,13 +1628,15 @@ type BasicDeliveryRuleCondition interface { AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) + AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) + AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) } // DeliveryRuleCondition a condition for the delivery rule. type DeliveryRuleCondition struct { - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1519,6 +1692,14 @@ func unmarshalBasicDeliveryRuleCondition(body []byte) (BasicDeliveryRuleConditio var drufnc DeliveryRuleURLFileNameCondition err := json.Unmarshal(body, &drufnc) return drufnc, err + case string(NameHTTPVersion): + var drhvc DeliveryRuleHTTPVersionCondition + err := json.Unmarshal(body, &drhvc) + return drhvc, err + case string(NameCookies): + var drcc DeliveryRuleCookiesCondition + err := json.Unmarshal(body, &drcc) + return drcc, err case string(NameIsDevice): var dridc DeliveryRuleIsDeviceCondition err := json.Unmarshal(body, &dridc) @@ -1613,6 +1794,16 @@ func (drc DeliveryRuleCondition) AsDeliveryRuleURLFileNameCondition() (*Delivery return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. +func (drc DeliveryRuleCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. +func (drc DeliveryRuleCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCondition. func (drc DeliveryRuleCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1628,11 +1819,213 @@ func (drc DeliveryRuleCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRu return &drc, true } +// DeliveryRuleCookiesCondition defines the Cookies condition for the delivery rule. +type DeliveryRuleCookiesCondition struct { + // Parameters - Defines the parameters for the condition. + Parameters *CookiesMatchConditionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' + Name Name `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) MarshalJSON() ([]byte, error) { + drcc.Name = NameCookies + objectMap := make(map[string]interface{}) + if drcc.Parameters != nil { + objectMap["parameters"] = drcc.Parameters + } + if drcc.Name != "" { + objectMap["name"] = drcc.Name + } + return json.Marshal(objectMap) +} + +// AsDeliveryRuleRemoteAddressCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestMethodCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestMethodCondition() (*DeliveryRuleRequestMethodCondition, bool) { + return nil, false +} + +// AsDeliveryRuleQueryStringCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleQueryStringCondition() (*DeliveryRuleQueryStringCondition, bool) { + return nil, false +} + +// AsDeliveryRulePostArgsCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRulePostArgsCondition() (*DeliveryRulePostArgsCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestURICondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestURICondition() (*DeliveryRuleRequestURICondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestHeaderCondition() (*DeliveryRuleRequestHeaderCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestBodyCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestBodyCondition() (*DeliveryRuleRequestBodyCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestSchemeCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleRequestSchemeCondition() (*DeliveryRuleRequestSchemeCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLPathCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileExtensionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileNameCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) { + return nil, false +} + +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return &drcc, true +} + +// AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) { + return nil, false +} + +// AsBasicDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleCookiesCondition. +func (drcc DeliveryRuleCookiesCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRuleCondition, bool) { + return &drcc, true +} + +// DeliveryRuleHTTPVersionCondition defines the HttpVersion condition for the delivery rule. +type DeliveryRuleHTTPVersionCondition struct { + // Parameters - Defines the parameters for the condition. + Parameters *HTTPVersionMatchConditionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' + Name Name `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) MarshalJSON() ([]byte, error) { + drhvc.Name = NameHTTPVersion + objectMap := make(map[string]interface{}) + if drhvc.Parameters != nil { + objectMap["parameters"] = drhvc.Parameters + } + if drhvc.Name != "" { + objectMap["name"] = drhvc.Name + } + return json.Marshal(objectMap) +} + +// AsDeliveryRuleRemoteAddressCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestMethodCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestMethodCondition() (*DeliveryRuleRequestMethodCondition, bool) { + return nil, false +} + +// AsDeliveryRuleQueryStringCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleQueryStringCondition() (*DeliveryRuleQueryStringCondition, bool) { + return nil, false +} + +// AsDeliveryRulePostArgsCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRulePostArgsCondition() (*DeliveryRulePostArgsCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestURICondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestURICondition() (*DeliveryRuleRequestURICondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestHeaderCondition() (*DeliveryRuleRequestHeaderCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestBodyCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestBodyCondition() (*DeliveryRuleRequestBodyCondition, bool) { + return nil, false +} + +// AsDeliveryRuleRequestSchemeCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleRequestSchemeCondition() (*DeliveryRuleRequestSchemeCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLPathCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLPathCondition() (*DeliveryRuleURLPathCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileExtensionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLFileExtensionCondition() (*DeliveryRuleURLFileExtensionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleURLFileNameCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleURLFileNameCondition() (*DeliveryRuleURLFileNameCondition, bool) { + return nil, false +} + +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return &drhvc, true +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + +// AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsDeliveryRuleCondition() (*DeliveryRuleCondition, bool) { + return nil, false +} + +// AsBasicDeliveryRuleCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleHTTPVersionCondition. +func (drhvc DeliveryRuleHTTPVersionCondition) AsBasicDeliveryRuleCondition() (BasicDeliveryRuleCondition, bool) { + return &drhvc, true +} + // DeliveryRuleIsDeviceCondition defines the IsDevice condition for the delivery rule. type DeliveryRuleIsDeviceCondition struct { // Parameters - Defines the parameters for the condition. Parameters *IsDeviceMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1704,6 +2097,16 @@ func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleURLFileNameCondition() return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. +func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. +func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleIsDeviceCondition. func (dridc DeliveryRuleIsDeviceCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return &dridc, true @@ -1723,7 +2126,7 @@ func (dridc DeliveryRuleIsDeviceCondition) AsBasicDeliveryRuleCondition() (Basic type DeliveryRulePostArgsCondition struct { // Parameters - Defines the parameters for the condition. Parameters *PostArgsMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1795,6 +2198,16 @@ func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleURLFileNameCondition() return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. +func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. +func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRulePostArgsCondition. func (drpac DeliveryRulePostArgsCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1814,7 +2227,7 @@ func (drpac DeliveryRulePostArgsCondition) AsBasicDeliveryRuleCondition() (Basic type DeliveryRuleQueryStringCondition struct { // Parameters - Defines the parameters for the condition. Parameters *QueryStringMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1886,6 +2299,16 @@ func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleURLFileNameCondition return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. +func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. +func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleQueryStringCondition. func (drqsc DeliveryRuleQueryStringCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1905,7 +2328,7 @@ func (drqsc DeliveryRuleQueryStringCondition) AsBasicDeliveryRuleCondition() (Ba type DeliveryRuleRemoteAddressCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RemoteAddressMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -1977,6 +2400,16 @@ func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. +func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. +func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRemoteAddressCondition. func (drrac DeliveryRuleRemoteAddressCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -1996,7 +2429,7 @@ func (drrac DeliveryRuleRemoteAddressCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestBodyCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestBodyMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2068,6 +2501,16 @@ func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleURLFileNameCondition return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. +func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. +func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestBodyCondition. func (drrbc DeliveryRuleRequestBodyCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2087,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2109,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2124,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2138,7 +2591,7 @@ func (drrha DeliveryRuleRequestHeaderAction) AsBasicDeliveryRuleAction() (BasicD type DeliveryRuleRequestHeaderCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestHeaderMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2210,6 +2663,16 @@ func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. +func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. +func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestHeaderCondition. func (drrhc DeliveryRuleRequestHeaderCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2229,7 +2692,7 @@ func (drrhc DeliveryRuleRequestHeaderCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestMethodCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestMethodMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2301,6 +2764,16 @@ func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. +func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. +func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestMethodCondition. func (drrmc DeliveryRuleRequestMethodCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2320,7 +2793,7 @@ func (drrmc DeliveryRuleRequestMethodCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestSchemeCondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestSchemeMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2392,6 +2865,16 @@ func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleURLFileNameConditi return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. +func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. +func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestSchemeCondition. func (drrsc DeliveryRuleRequestSchemeCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2411,7 +2894,7 @@ func (drrsc DeliveryRuleRequestSchemeCondition) AsBasicDeliveryRuleCondition() ( type DeliveryRuleRequestURICondition struct { // Parameters - Defines the parameters for the condition. Parameters *RequestURIMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2483,6 +2966,16 @@ func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleURLFileNameCondition( return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. +func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. +func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleRequestURICondition. func (drruc DeliveryRuleRequestURICondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2502,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2524,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2539,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2553,7 +3056,7 @@ func (drrha DeliveryRuleResponseHeaderAction) AsBasicDeliveryRuleAction() (Basic type DeliveryRuleURLFileExtensionCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLFileExtensionMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2625,6 +3128,16 @@ func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleURLFileNameCon return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. +func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. +func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileExtensionCondition. func (drufec DeliveryRuleURLFileExtensionCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2644,7 +3157,7 @@ func (drufec DeliveryRuleURLFileExtensionCondition) AsBasicDeliveryRuleCondition type DeliveryRuleURLFileNameCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLFileNameMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2716,6 +3229,16 @@ func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleURLFileNameConditio return &drufnc, true } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. +func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. +func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLFileNameCondition. func (drufnc DeliveryRuleURLFileNameCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -2735,7 +3258,7 @@ func (drufnc DeliveryRuleURLFileNameCondition) AsBasicDeliveryRuleCondition() (B type DeliveryRuleURLPathCondition struct { // Parameters - Defines the parameters for the condition. Parameters *URLPathMatchConditionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameIsDevice' + // Name - Possible values include: 'NameDeliveryRuleCondition', 'NameRemoteAddress', 'NameRequestMethod', 'NameQueryString', 'NamePostArgs', 'NameRequestURI', 'NameRequestHeader', 'NameRequestBody', 'NameRequestScheme', 'NameURLPath', 'NameURLFileExtension', 'NameURLFileName', 'NameHTTPVersion', 'NameCookies', 'NameIsDevice' Name Name `json:"name,omitempty"` } @@ -2807,6 +3330,16 @@ func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleURLFileNameCondition() ( return nil, false } +// AsDeliveryRuleHTTPVersionCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. +func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleHTTPVersionCondition() (*DeliveryRuleHTTPVersionCondition, bool) { + return nil, false +} + +// AsDeliveryRuleCookiesCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. +func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleCookiesCondition() (*DeliveryRuleCookiesCondition, bool) { + return nil, false +} + // AsDeliveryRuleIsDeviceCondition is the BasicDeliveryRuleCondition implementation for DeliveryRuleURLPathCondition. func (drupc DeliveryRuleURLPathCondition) AsDeliveryRuleIsDeviceCondition() (*DeliveryRuleIsDeviceCondition, bool) { return nil, false @@ -3631,6 +4164,19 @@ type HeaderActionParameters struct { Value *string `json:"value,omitempty"` } +// HTTPVersionMatchConditionParameters defines the parameters for HttpVersion match conditions +type HTTPVersionMatchConditionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // Operator - Describes operator to be matched + Operator *string `json:"operator,omitempty"` + // NegateCondition - Describes if this is negate condition or not + NegateCondition *bool `json:"negateCondition,omitempty"` + // MatchValues - The match value for the condition of the delivery rule + MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` +} + // IPAddressGroup CDN Ip address group type IPAddressGroup struct { // DeliveryRegion - The delivery region of the ip address group @@ -4237,7 +4783,7 @@ type PostArgsMatchConditionParameters struct { OdataType *string `json:"@odata.type,omitempty"` // Selector - Name of PostArg 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' + // Operator - Describes operator to be matched. Possible values include: 'PostArgsOperatorAny', 'PostArgsOperatorEqual', 'PostArgsOperatorContains', 'PostArgsOperatorBeginsWith', 'PostArgsOperatorEndsWith', 'PostArgsOperatorLessThan', 'PostArgsOperatorLessThanOrEqual', 'PostArgsOperatorGreaterThan', 'PostArgsOperatorGreaterThanOrEqual' Operator PostArgsOperator `json:"operator,omitempty"` // NegateCondition - Describes if this is negate condition or not NegateCondition *bool `json:"negateCondition,omitempty"` @@ -4976,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -4998,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5013,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5040,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c2f0c23c6c42d27b67a8d501686eb52db9b26ad3 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 013/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 3051ab8d0ed22db1fed576f8649344067aa9e9d5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 014/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 695d897885a8..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 73cd3f5cb426..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 8d810a11a371..2cef2b3b77f2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5520,7 +5377,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5542,11 +5399,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5562,11 +5414,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5594,78 +5441,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 69bed1ed1192997952dfe53ac19ad70da289b274 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 015/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2cef2b3b77f2..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4030,6 +4173,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5377,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5399,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5414,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5441,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d282e2612200e17dd6b55a79e45516871b868292 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 016/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5395cefb052d77e3433d473d3763c076a3bb2a6a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 017/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7771c08326fc6e82adea3f31b5aa11eac0df8e2d Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 018/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From a95ae7eb3eebdc67aa34012419e758a134a95a5c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 019/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 695d897885a8..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 73cd3f5cb426..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 8d810a11a371..2cef2b3b77f2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5520,7 +5377,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5542,11 +5399,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5562,11 +5414,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5594,78 +5441,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bb4f939bf58b7a3a4c6256981ba069e42b1f516e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 020/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2cef2b3b77f2..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4030,6 +4173,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5377,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5399,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5414,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5441,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 40c9ad7a2914964ccd379d16132e7ac82069343c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 021/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 06b050edd3d0541308be8ccdf0dde16b9c1084d6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 022/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 46658be28cc0a446e5fe002ea3ffb28444cb8177 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 023/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85f7f81a554346de9d8b26ad78d773aeb7b02401 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 024/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2f934280a44e5c4671ae960372e569c0a9497ddc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 025/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 859dc685ed6ffeb8c6e00483395b0dd021f66751 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 026/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 47274169b3d3a2156618dadd819d208c3d91e241 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 027/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 48b341b82d92b3ebfa0f9d3a894af6b81a4907ee Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 028/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 695d897885a8..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 73cd3f5cb426..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 8d810a11a371..2cef2b3b77f2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5520,7 +5377,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5542,11 +5399,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5562,11 +5414,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5594,78 +5441,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5197858c15f83c54caea1969ad693a6818aeb851 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 029/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2cef2b3b77f2..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4030,6 +4173,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5377,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5399,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5414,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5441,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8fef289f6332d0ba59a7356170bdd05dd798e321 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 030/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b487d104297316e9b0c60a84a3900ef6d0f3c3b0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 031/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b3f597a6a1e5ca28a50e7f3021aad1a164992e76 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 032/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9f9c9747319652b0dd4841de17cf6c37bb5974c4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 033/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 250748c6e4c3447e3b34ef88a95473d8ae00868e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 034/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8ee9a4d3a50b3029b2d6f75fea114553ff4c410f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 035/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3819d209d8ab431a7bcd4e65e4b607c983878037 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 036/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From aa1ed1a1391e6ee647af30b1ad2ff84159c5512f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 037/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f93528991f8a00d51979d0b3d8c1a1665099972a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 038/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 333881f6ca5b97a3d0f8334ade46fe82b46be976 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 039/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d8269b11a825396662d8054b556a3f60b1ae75df Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 040/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From db0503fc4df866aa532374687b4d70a680a11753 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 041/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 22c555b13fccf5e04c3afbb4beac4c1cbc1017d5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 042/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1913bab5c58d08e228a3ca38448a56e868916f61 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 043/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 08c94358049f90743e6b7d4bc7f255a73478ea9f Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 044/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9dc7b82e01ab..fad812664b8c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -31,25 +31,24 @@ jobs: displayName: 'Create Go Workspace' - script: | set -e - go version curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +56,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 3e72368d9ab71403226816956bda8305162e590a Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 045/558] add windows builds and refactor --- azure-pipelines.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fad812664b8c..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -28,27 +36,28 @@ jobs: mv !(work) '$(sdkPath)' echo '##vso[task.prependpath]$(GOROOT)/bin' echo '##vso[task.prependpath]$(GOPATH)/bin' + go version displayName: 'Create Go Workspace' - script: | set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -56,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 9ba33a78e1b34f071df8f5f1afce144c0a4540c5 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 046/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 7293e302d93331f88fa3a3f05a4e59effce34b97 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 047/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 695d897885a8..60174017b66c 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index 73cd3f5cb426..a59e809f0c45 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -157,12 +157,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -213,15 +211,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -377,7 +366,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -399,7 +387,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -498,8 +485,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -650,9 +635,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 8d810a11a371..2cef2b3b77f2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5520,7 +5377,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5542,11 +5399,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5562,11 +5414,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5594,78 +5441,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 90ae8c17dca27f71944e64e727d0918684fb8f29 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 048/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2cef2b3b77f2..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4030,6 +4173,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5377,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5399,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5414,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5441,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2dfaf86de627dea0c9b11970ad2aa9c5ef89d7a2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 049/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 01067165a502ff740a7005bb9a3b99ffc8f43e21 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 050/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f760e7b4885346d53105bee9fba1fd1344e93c7c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 051/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 30a198cc2675f5688454c517e706d795894e008c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 052/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f65a76e9d6f55469da35c8e9d647fc77105c9a22 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 053/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2818739451e3c4408cf570970db0680339e846f2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 054/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2c38dd61f0dfd8a70d8213695e0affc113d98d21 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 055/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 351fbd0238439dcec4134ec85b0efe62bbaf6605 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 056/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1c58f156ba37cd7ae8af3f15928270d7e5a077d5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 057/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bdceccd181fcdb71c510b6ce26d683919a0ae1e3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 058/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From efb5fbe64c46b0fa8caf4aea7ca3d7b8f8f1e48c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 059/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f1654c592e484540744c00516f43ecb9c3d6ed01 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 060/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a43137beedabf6ca6571cb08d19cd0510b5c0ef3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 061/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5440736d5b4a873602c9147d9b86699bf8584a95 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 062/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6b8a305f2d7aa37e33f040b7de26859fcf041539 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 063/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 07079556411fa2abdaf6aae5902b11378955ae6f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 064/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 403f96fe7efc97838851947d4de8ea5b4991caf0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 065/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3b3aeaa8e41b93a7e2444a8bde0765da46def36f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 066/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 143f4ba639813a8876b4f110052d057a2ee2dde0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 067/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1c9920f5211e96317f51e2da3b9b3b5e13877ef5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 068/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 50b6ddee0626c3863b32802ef8809a33047a1318 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 069/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1332c336803db83fd4dd0c77852536f8889eacce Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 070/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85ae7bfe1d654979d9072208c3419444b1b84fe6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 071/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a1b0bac2b14e2800b37b27623109dc63ec5c5c19 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 072/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 98b8e090837a196f033cf1285ce864aa54c5617f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 073/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 905a276a6a4fd449f33d21a6a1bb766c87e62f82 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 074/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c4ef8984470ba999f4f63ded6bb00562d1f10c27 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 075/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 47e3326b0d3be1bd52476cfdf7af6a8c797afe87 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 076/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cb6b3a597ba10b6dad82f5d5084f9a61e06c02d3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 077/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..232fb1236cbf 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,8 +296,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -306,13 +304,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -416,25 +412,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -759,15 +736,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1372,17 +1340,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1398,10 +1364,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1414,10 +1376,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1458,11 +1416,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1478,11 +1431,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1497,7 +1445,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1519,11 +1467,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1539,11 +1482,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1554,67 +1492,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2530,7 +2407,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2552,11 +2429,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2572,11 +2444,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2995,7 +2862,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3017,11 +2884,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3037,11 +2899,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5522,7 +5379,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5544,11 +5401,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5564,11 +5416,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5596,78 +5443,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0fe1db98235f7b30ebf2baef80d2fedc45154c7b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 078/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 232fb1236cbf..9b2cb95cb242 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -296,6 +296,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -304,11 +306,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -412,6 +416,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -736,6 +759,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1340,15 +1372,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1364,6 +1398,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1376,6 +1414,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1416,6 +1458,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1431,6 +1478,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1445,7 +1497,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1467,6 +1519,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1482,6 +1539,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1492,6 +1554,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2407,7 +2530,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2429,6 +2552,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2444,6 +2572,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2862,7 +2995,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2884,6 +3017,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -2899,6 +3037,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5379,7 +5522,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5401,6 +5544,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5416,6 +5564,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5443,6 +5596,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 89db223d8cb0ca5b09c22ee561a5bc1860e7d3e7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 079/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 81 +++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 9b2cb95cb242..7ae2a1ce9775 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -1175,12 +1175,91 @@ type CustomDomainProperties struct { 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 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. ProvisioningState *string `json:"provisioningState,omitempty"` } +// 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 { @@ -4173,8 +4252,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From 69c6d9da6355bba1cbd751dd6ef157b53b1c2d52 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 080/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9dc7b82e01ab..fad812664b8c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -31,25 +31,24 @@ jobs: displayName: 'Create Go Workspace' - script: | set -e - go version curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +56,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From c9906ba7013ff0ad1b491849858eff7b1d5f0705 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 081/558] add windows builds and refactor --- azure-pipelines.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fad812664b8c..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -28,27 +36,28 @@ jobs: mv !(work) '$(sdkPath)' echo '##vso[task.prependpath]$(GOROOT)/bin' echo '##vso[task.prependpath]$(GOPATH)/bin' + go version displayName: 'Create Go Workspace' - script: | set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -56,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 6781452deb31a2103d97d05c6a9a1e624c24c9f4 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 082/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From 510a45c32b58aa33d19a23998cac78855ac64726 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 083/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 978bd80bbf83..ebd7226f37b6 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index fc8fc506a58a..baac1b39ac33 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6a1bfe420c4d0c2333b384eca43aee393ac9fd9d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 084/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a92ef9ec8edbf8765b55e0554a744563099d42b3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 085/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7d20a8a59f353d91391f2342f85791f192d2693a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 086/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ebd28f83f4be00c8817789ab8e63d5d1b248f2d3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 087/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a28781ce12f53884f5b1d63db976f7fcfd213bf3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 088/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1df45aa06aacaf2b4057353aacf0a39df2fcdce2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 089/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7591102ec697a3cc5e70b9d8cea59a0bd743d8d4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 090/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c4693efaa42e68b4dccba7d9c790a82b12508963 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 091/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 66409fac12a722945d79e294cac2766bb887d770 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 092/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d33423917ad48cfbf3aad24073970669742bb06d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 093/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 02fa7705caa98dc874e09c6eef11670da3e6ab69 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 094/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cd00b387f72c79a99c682703f96f4c4b3bf928d7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 095/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ed51deeb35b499b92f399e71ae99b2b99f77515c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 096/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 05c4ea04968acc33a748d58ba1ba2c63b60aed96 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 097/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 92d258377f45dd98388cf3191241569ec2447ec6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 098/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3c59044fd15876e9dcdcf4e1e6fee37f39d52e1e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 099/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85ad12af8d29561c7612371465d41bdb5498405f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 100/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 55e9b59040beba03b14650d30a0437c51e07b75a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 101/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 113f267a9fb0e39f36d47a7ed6533c9697549bde Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 102/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7e2e6fb3682f670760072390ecbc80400f91ecce Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 103/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 49b9f40c0c26a7f0f46abdc1fc5ad2a665e05172 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 104/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3e241b0fa5dd7bd644387a373ec56c45c49f6f77 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 105/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 59f80ba7d570ae2e32b62915880ff18032654c44 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 106/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c4fbe78d5ae231331f9298b593b9b0fe34f97948 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 107/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 66f9ff27631c17c2f9a726e8d4ef9be161748ad6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 108/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6e3f909588f9e626f0aee5118d7758f41b7a7e8d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 109/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 24e8570c9414f0f3df42c582c075ba85762d5f54 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 110/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e18e76da962637eb89fd2e959f8f25f22a114c88 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 111/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 253d6c9298da1b5ce3802329921435a7915f2687 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 112/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2827e1e3a2b3a016dbcfd19f219807cc5687d0c1 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 113/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 81c1bb2ce8587910a8c253d0f3a705ed5026fdc5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 114/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fca1c5ce213be2d563407a875d76750f36bebe38 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 115/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 30aeea112a219936ae0ce7340b657d63dfe46330 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 116/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 5f45dbbb2de0a6b3cff723104bb844de846048e7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 117/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5d15168c1c1c3a4c8cf30f9aef5857dba2d46c82 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 118/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From aceba0b9abd3453b824461a20a1be85a34ab6215 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 119/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 65eeed12ee3efddf6d8cf5173e44b0834044e433 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 120/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f922ef14d6d8e2b85af93bbf8af2c48252c949e3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 121/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 15c70b9aca10663044daa7c0c170777da371dd18 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 122/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d4cb4950efae733ee7926b64815438b2b3f3ca9a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 123/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8365caeb7d00b2fae52c3c061822ba6631888fc0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 124/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9def3ed7d89f08612523a1a662adf2265c684448 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 125/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d7c181e07eb5dbf4f41732fbf2c1e84d1d4d3f7f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 126/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From abd3c2dc2f3d1b9ad5f27bcdd545d0d4f3dcbf94 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 127/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 80c91ac4abf3efcf88d1c07cf037d60d01582817 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 128/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 88b9ed4aaeb0616044ea5d963bdb990160dff8e0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 129/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3942feedda606e9c30cf093d248813a94a8af899 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 130/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8aa47d69e35ea5e9a6e7710fae8a0aa6f84ccdde Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 131/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7c3b752b62ff643a52faedf48a6ae139115d727b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 132/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7f7c8709f802583371cee105defa747edcafcf8e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 133/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 10655df41ba217cb14d73347700e4fdfb8293ed0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 134/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5e07ab30f480260ed6be8d7ae75350ef1a52fa62 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 135/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 75ae587239d1df03f84098b730a0e056ad8f4c13 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 136/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b91a4fcf3d5d5492f0287ec5452ce74f22d5507f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 137/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a575badf4072bd48be0b47bcf2265f0fa11d3a71 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 138/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1cb73d4d8d884d37ae9f2f26583beefebdc8eff9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 139/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 076d1887b59a8ea91459a1da6f3fa136cc392bae Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 140/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ed3111a5f69c5d03df0874898d07e9ea6665fb80 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 141/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b5b93e05111a704adc6672c5793ba02de634e5b7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 142/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5897878308eb159938521593aff56e2bac466f5d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 143/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4464517e038664c56e034ceeb212d6caf10d9a43 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 144/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 776c684514b659f3c848151e5c8a81d6e06bf00f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 145/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c8cbcdde4ff911f0643b6b1394522bb5b87347e4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 146/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 964945f33f9b6c81992609741f75424cbba13980 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 147/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c007e361df1f25831bffc25832d3ed3ad7a8e97d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 148/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ce508eca2f170bdb16e1a975861b9f97657b6018 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 149/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From 53f9640bed59c697d67fbf86938776632a9d0171 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 150/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From f1f7a211745702b4837d7a4d123c6dbec8c146e5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 151/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 978bd80bbf83..ebd7226f37b6 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index fc8fc506a58a..baac1b39ac33 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e81d821a24c27e0ab5f60bcc87e1444d8952707d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 152/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 246b4ab777318cac27dd08ace578d4ab4575b394 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 153/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9dd7cf840839f279e5aaec187f31a50a2a38aff1 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 154/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0701b9eeaf5c07ce1e6bc8f0aa2684f7dab65e4e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 155/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2f8e5c94a7753eaee22f43928c38d4b697c60401 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 156/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9848197f59b0134873851ac5ea053907d1ebe8ce Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 157/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9cace4e8bea48481158adbd57d069b7db528e7b9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 158/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 860808a6252f46491b7224a7b28f5fdc893fb922 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 159/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a137b592bbb579d37ace2acc7077b432a7447900 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 160/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ec29da0851dba069e0e1cf20fce2fa108e30b06b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 161/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 01df42f1891f585f29a0b51e746850b141756bbe Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 162/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6d32389deb3acb5e7c2492483cc30454b82e4b3f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 163/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a748f31a345f50ea4e071f916524f628f2726c75 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 164/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a1137f9a3c276155ac44327d959c85d37a358d2f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 165/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d8593fe07f6dc05bb69fd7426b756da039b9c676 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 166/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b3ab13b674de0119104b0c2a18dad2eb37eff516 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 167/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fbed45339187a06f6c0875d034ec8c255654716e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 168/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a0dd5858c0888e22e0ce7027619cd08267a37113 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 169/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f3fd46f911cc16d2db158e85871d060cfea73111 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 170/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From db4f9e765f1e6871902314e2e2bb7a486a7b6696 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 171/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 81f75ccdae2eb2c11f93c1f15c35701bf662b1fc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 172/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cb76cddfed8c56e53d1419c6a83d690856e56f5b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 173/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From db433a0258b14d6b68216987c190ab49988aaba5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 174/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 12bb36785779fd6112ee3542d460b6bd20cd23c4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 175/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c67dafbd2e96a4b5937b4e5b57b397a854ca0d2c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 176/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9423984243747dc0776aa44ddc3dc00c5d7367e5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 177/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 660c890434528c3dc7832fa57410f8f9ff091882 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 178/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ec93149768a79b273123a234deaa4840b802e773 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 179/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0ecfd1b51fd9360172804dbd0dec4ad6c817ecb2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 180/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6ce04a7188346d1d0d05203c5c358ebeca626aab Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 181/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From eb09e1e491b3763211f9bad0970570b51cd9255e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 182/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2888529c978d67acbf4901f0901ed86240bdadb1 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 183/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 8821dc52940b519f6ab6ebcbc010c911af553dd0 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 184/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From e9426676e1a471a7ae079f58735ec3838b3e2358 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 185/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5d1339291a14a5dea419adc3ebbd0fc08a3a9afd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 186/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 88740c715736d66c804738cfcc77393cf5a57624 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 187/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 73962e245655345f44b3ecb25bcde1d40817b507 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 188/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From deef42766b3797a8d264cf4530714679a08a2557 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 189/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 48dcc7948e375984c033ec2c8d6d9bedfc901765 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 190/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4042b33a5646c9dc49768e5d4955f3e7c7c067e6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 191/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9f1ec4cb35fc9a1d444c655da7039ad240c61492 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 192/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 33114fed443eb9b9d93789c01b51243969aa850f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 193/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 349450f57c975353d90340deea6221cec0483e07 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 194/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c990b4361848b4441d37f7b10d7ea5e092d0e621 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 195/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bee9f295082f0ab5b385af267e797976262773c8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 196/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2475a35e702fa3c302535a2aa57ffaa980515367 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 197/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 10867be97b55db5578aea15f09f2431102ed8664 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 198/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3f9cb74fe1f5df785d0aafdd47d48c4579997a14 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 199/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3b0f206faf9f41bff1579397e4995ad1145d6aa0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 200/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d82cf4c0aadfe48e3ba88703ce18388bc0ac77c4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 201/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9210361acb6006f75e6348e5a40578c206fde316 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 202/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 27b68742a7a617630e42eb8ccb350b4a57a7bf12 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 203/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 570a2281543e25e9a2652401af5705fcd114712a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 204/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6de52aabddda526b1f71eceb946c5e3b35a6fb0b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 205/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f3ffa61f8e0f8c6ba2cf81819e8c85f214f1f752 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 206/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0ad3a97bb71273f82ed2f33bc901c15fa7e4b7c0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 207/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 59fa5edc27642bf106722a0a961324b760097db7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 208/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5388fd01c29e2be5ffc8ba918e9aff20a9e0ddd3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 209/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From edf15b7502eb70f528e7bd2d7f803782e1e27909 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 210/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f68142bb41a07a6e491c23d55b60e1981263fb21 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 211/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d9dbd1fbe8c5ae822924680fc5dd6ac2b7b6e37f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 212/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e70228cd6e32506b10607ee2ca4bbe7562b32a39 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 213/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e9f4c9cdad8c9228b25815b7a3b4c1c23e59ca78 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 214/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85b327e36b3f4cb4dee8477263f7017190d5a273 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 215/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From eea56cca69c988f142a056d56c944c656fff273f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 216/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2e6fbc19a82c545ba187100bc0b4cd3e20f0676e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 217/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From 33152a12878fe729a79bcdf27d1c2bd68ed28604 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 218/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2fcdbc46ce274464468387a82c77275dea4e4aae Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 219/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9ca19057e6e0fc33c2870d4b92c1fcf18e38a79f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 220/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4341359f3486f7ac64f0bbb78b4c88f1bf96ef15 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 221/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f81794297468e6aa4523c98fc1073269f2daed16 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 222/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4a468f80102c3e33b8a0eac5c280c71fe9eb604c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 223/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 548c11b4289ffb1f6f331d9932ceee63d3e900cc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 224/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c9470a0894443a405eb629202b9d5c8914cf62a3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 225/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f0c70d5df6c3b3aa8fae2283cdba829daa7c9616 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 226/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 45d84e536f3bd58f3fab24ae1ff573a7f22e2991 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 227/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6e36a071be181bc5e38b60ee470906bfc43b8c69 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 228/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0e0fd670e79556b7335d651a4639a9b3c0d3d355 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 229/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fd70dcf42e801996e75989f4952d3b4b0238421a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 230/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 59a81ad35a0b07cb66fe5aa6b0f0013ae2bf30f6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 231/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d4b3494905477ca432f0d32825fb615ac205895d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 232/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2c1de572f9bc45fd4c791db3b51775227eda87e9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 233/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 15cdf631e6cd34445e8f8ce70a8968fe6cf8479b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 234/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 125bac19eb1e6565049f5da3cf2952928e4d7806 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 235/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1b45e3f14ef3a4612c84a9f06950308eedde42f6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 236/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 33ca01b09a07a8b44cc14226aa05a772e1b5344d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 237/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 27b07f6aae8734dd04d19201438d9166629b606d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 238/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 27abd71791ea364a6aca5c998dcd4f17ade83d84 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 239/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1c58f5ff95472915d1f0ba1d115938547bcbf272 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 240/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3c35524d289be8796de34a373dee3b6d2b662901 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 241/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d19bb94aee7af72d3331ddaab11bf37f553c95fb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 242/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0bf7d88600d8b4c0091548109e9400c92f4d4b51 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 243/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fbd4d146744e7f5c5accb1278c205d4062b5800a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 244/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4f616957fbb9de0f5455cc44314c40f0d66d5a90 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 245/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 992b1959e6a1d1ede9ca8c839303076716a2aea4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 246/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8155dc77bb76b62f0e7e84da3118301573f33a5b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 247/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b7b1cbadce3aec79e4b74911f53832561bd64ef0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 248/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6042632e6f11f33bf8159dbf67d9a760a410c0ce Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 249/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2d54f70c9e9c836719e7e6f812cdde82729f1498 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 250/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 8c6629916499bba3e78ef96e8749935a490fa499 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 251/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 5efbadda42206ced044fa39505c7c4fce4a0d72c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 252/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0bfe72981c4a70d574462aa01977ee9a7f4c2fc5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 253/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5dc3bafb00fbd4a76b9dc6ace964067231370c3a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 254/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b3726f33f1b93c36680498c8a2314081d57531e6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 255/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2ebb2e35a79aac9c9d26b4eef4309a0915c179c6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 256/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fef1e5554a129a4a7dc0ef967ec1662f200e7838 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 257/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 20527ae693c3b205faf5d0b16f2e1b7cae9f2607 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 258/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9c2d4822d09c2591bb4a59249c273e6643acf151 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 259/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4eed0b840d2c8f96ef1062627d2cc762178b955e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 260/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9f60621fb8071cc5fedf6d9968628b970473257e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 261/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f56e9e39176842ea5b598f2ac2ec88a9e48fa328 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 262/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6c92daac3b2c6e0d9968da68a0ff8daa0ae8abe2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 263/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d83931c9fcd71b19f49f77f54afe82c5e77da29e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 264/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4346e257c28c965a28f643c8c44732eb7bb4d13a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 265/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ac4df3c1d8b579087d3523cd442f15e9c935a046 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 266/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From de70ce151b69d545936666116f9db62317728def Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 267/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 998c42607e55f1689f5a77b019ee0cfdf009be3c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 268/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 01028623091b565614317bb0c3e2d7a2b8c51cb7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 269/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 183ff0c9877896bfc3c321370340df2222467e81 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 270/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4d0a9939866c5c579e0b5cf6088f5e31128827e2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 271/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ee1db880e42a419e814b1dcb008bfe6699213376 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 272/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8377f8b33ddf04282d20e9f3d3d952a74030c525 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 273/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e654651756b3ed026752e282ebe37d1cf56b4db6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 274/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 59b8ecf74fec5258b1a2e994ee670b4865bb615e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 275/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9416d0db3150970cf628a14778f8ed727363bf6f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 276/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From da52860da61af22023a5fcf9211d70200eb4694f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 277/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b6fafd08a0d9724ebe97d0f6ba0beb836fe0d6f8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 278/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e2ca6278098fdbbb82ff3ae3a9c75608ed742cd1 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 279/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From da7d6fb950067c3d842bd3d81b5a062b330ef828 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 280/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5e7f54e6102b48512bc9980940dafd0c81cc89c8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 281/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From eb5101ecbeb79c48f5759ca0c530bdf8d3871b95 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 282/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7c3dadda7d58360c1b8932ccd54fe145df4d1cf5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 283/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 09d92e0fa9c35d3f60f55393a3d7054abf8cc2c2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 284/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From 3b305a8d8910ba7c262d62cfee7f08c506d5f59c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 20:38:32 +0000 Subject: [PATCH 285/558] [AutoPR cdn/mgmt/2019-04-15] Publish 2019-04-15 API version to make reviewing new API changes easier (#992) * Generated from 4c8ee7e14e0fd01841bfcf174fdd850bedfdadfb Publish 2019-04-15 API version to make reviewing new API changes easier * Modifications after running after_scripts From fe9257cb2df724caab8fd02c0ae629becae120e3 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 286/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9dc7b82e01ab..fad812664b8c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -31,25 +31,24 @@ jobs: displayName: 'Create Go Workspace' - script: | set -e - go version curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +56,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 1b59a9246b50da399e201bf156a9a87a2a83642c Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 287/558] add windows builds and refactor --- azure-pipelines.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fad812664b8c..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -28,27 +36,28 @@ jobs: mv !(work) '$(sdkPath)' echo '##vso[task.prependpath]$(GOROOT)/bin' echo '##vso[task.prependpath]$(GOPATH)/bin' + go version displayName: 'Create Go Workspace' - script: | set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -56,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 05c5f52369fc56c8a9e252aebae41f4a9e378319 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 24 Jul 2019 15:25:42 -0700 Subject: [PATCH 288/558] Add schema and create_sdk_pull_requests to config --- swagger_to_sdk_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index cb18404b1b0b..b6223b1d44c0 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/swagger_to_sdk_config.schema.json", + "$schema": "https://openapistoragetest.blob.core.windows.net/sdkautomation/test/schemas/swagger_to_sdk_config.schema.json", "meta": { "after_scripts": [ "dep ensure", From cad0c11228fcf5d9f905e139797b0845d9cb3155 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 289/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- profiles/latest/cdn/mgmt/cdn/models.go | 18 -- profiles/preview/cdn/mgmt/cdn/models.go | 18 -- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 3 files changed, 6 insertions(+), 267 deletions(-) diff --git a/profiles/latest/cdn/mgmt/cdn/models.go b/profiles/latest/cdn/mgmt/cdn/models.go index 978bd80bbf83..ebd7226f37b6 100644 --- a/profiles/latest/cdn/mgmt/cdn/models.go +++ b/profiles/latest/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go index fc8fc506a58a..baac1b39ac33 100644 --- a/profiles/preview/cdn/mgmt/cdn/models.go +++ b/profiles/preview/cdn/mgmt/cdn/models.go @@ -165,12 +165,10 @@ type NameBasicDeliveryRuleAction = original.NameBasicDeliveryRuleAction const ( NameCacheExpiration NameBasicDeliveryRuleAction = original.NameCacheExpiration - NameCacheKeyQueryString NameBasicDeliveryRuleAction = original.NameCacheKeyQueryString NameDeliveryRuleAction NameBasicDeliveryRuleAction = original.NameDeliveryRuleAction NameModifyRequestHeader NameBasicDeliveryRuleAction = original.NameModifyRequestHeader NameModifyResponseHeader NameBasicDeliveryRuleAction = original.NameModifyResponseHeader NameURLRedirect NameBasicDeliveryRuleAction = original.NameURLRedirect - NameURLRewrite NameBasicDeliveryRuleAction = original.NameURLRewrite ) type OptimizationType = original.OptimizationType @@ -221,15 +219,6 @@ const ( ServerNameIndication ProtocolType = original.ServerNameIndication ) -type QueryStringBehavior = original.QueryStringBehavior - -const ( - Exclude QueryStringBehavior = original.Exclude - ExcludeAll QueryStringBehavior = original.ExcludeAll - Include QueryStringBehavior = original.Include - IncludeAll QueryStringBehavior = original.IncludeAll -) - type QueryStringCachingBehavior = original.QueryStringCachingBehavior const ( @@ -385,7 +374,6 @@ type BasicCustomDomainHTTPSParameters = original.BasicCustomDomainHTTPSParameter type BasicDeliveryRuleAction = original.BasicDeliveryRuleAction type BasicDeliveryRuleCondition = original.BasicDeliveryRuleCondition type CacheExpirationActionParameters = original.CacheExpirationActionParameters -type CacheKeyQueryStringActionParameters = original.CacheKeyQueryStringActionParameters type CertificateSourceParameters = original.CertificateSourceParameters type CheckNameAvailabilityInput = original.CheckNameAvailabilityInput type CheckNameAvailabilityOutput = original.CheckNameAvailabilityOutput @@ -407,7 +395,6 @@ type DeepCreatedOriginProperties = original.DeepCreatedOriginProperties type DeliveryRule = original.DeliveryRule type DeliveryRuleAction = original.DeliveryRuleAction type DeliveryRuleCacheExpirationAction = original.DeliveryRuleCacheExpirationAction -type DeliveryRuleCacheKeyQueryStringAction = original.DeliveryRuleCacheKeyQueryStringAction type DeliveryRuleCondition = original.DeliveryRuleCondition type DeliveryRuleCookiesCondition = original.DeliveryRuleCookiesCondition type DeliveryRuleHTTPVersionCondition = original.DeliveryRuleHTTPVersionCondition @@ -506,8 +493,6 @@ type URLFileNameMatchConditionParameters = original.URLFileNameMatchConditionPar type URLPathMatchConditionParameters = original.URLPathMatchConditionParameters type URLRedirectAction = original.URLRedirectAction type URLRedirectActionParameters = original.URLRedirectActionParameters -type URLRewriteAction = original.URLRewriteAction -type URLRewriteActionParameters = original.URLRewriteActionParameters type UserManagedHTTPSParameters = original.UserManagedHTTPSParameters type ValidateCustomDomainInput = original.ValidateCustomDomainInput type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput @@ -661,9 +646,6 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { func PossibleProtocolTypeValues() []ProtocolType { return original.PossibleProtocolTypeValues() } -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return original.PossibleQueryStringBehaviorValues() -} func PossibleQueryStringCachingBehaviorValues() []QueryStringCachingBehavior { return original.PossibleQueryStringCachingBehaviorValues() } diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ca0373d964f9bf029ac0ac70c4cb49fc48a0cff6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 290/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9d3b225246181eade23d9f526f3bb22eedbd5177 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 291/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8193a182bb0b9ec80a29a7410b6b1e38faeddbca Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 292/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 499f755ca437b179e989873776c688330f1d7ed2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 293/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a01c907c5f178f3ee8d1d232b16955ff9400bb8d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 294/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 69ced1821d901b0eafab2cdc130e9a8d5549bf82 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 295/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a35c745cca14dcbe630bceed594b68cdbf2aa668 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 296/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bb8185b957dca99f1e6d70dc01f07c6e2ca4ff9b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 297/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 68cb479c3bb5d7ef8fb57b7d6bad1cbb338df6b0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 298/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bd3f074f5102702656553461d6d2440682826ada Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 299/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f47da941eca4145dbab697d3b6cec8a712ff081b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 300/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d20e0fd0d58ddfa504066d7bf972f3ed6197a636 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 301/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7e6ed22ab45fec4e433100a66367d23764d02e57 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 302/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c9435581902374acf01275ee85087e60fc9a8dba Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 303/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 02f6d34273dd68af8ca7301ee5f372cfb322be44 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 304/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1e1ea6e9a6ebe96341fccb561d4c47cd752f4863 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 305/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From af4a457da684130a3323d15d3af309415878344d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 306/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b6f9553cfc9c1d9399fec9db919c6c06d5cf491e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 307/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From efa90512f71b46949733e3d41061cebaacc73fec Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 308/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 864b09b0e261e3a54458e753d1d9f1b0b4509f37 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 309/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a2ea58a6dae649d7d990cad576022f434177ba94 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 310/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c9a7c690223f7c20729d2ff7a939729215d5d53d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 311/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4832dde199cf328ff35d2c1807fb31120feaa051 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 312/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e9e66b0aedd39230ba3fd30bbc734a7da6abca60 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 313/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 96dcf97d1a9758389a69b9454764ab6403e5f3fb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 314/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4a848975279bafebd94d8a2b72fa389f06fc1451 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 315/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 49f79990c4682fc3d56faa2979309f2a2dcee4f3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 316/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2783b5b7ee1720441572e93650ebe642d7dac051 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 317/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9aee9da9d31109e73b737f37d01b0a115c693c97 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 318/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a2fb7bf699b67a262d622ba5db9c1a3f57314216 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 319/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 03a2ae30f958815d2f4cffca907ae5623b4ac751 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 320/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b82442e09a28c39626875e4fcd2b104de3cb1998 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 321/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 05fe4efb210c320665acb41a2e5a7cc4a50d4b91 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 322/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 207fad64dae91f7ef9c4e55c2b5071e266084182 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 323/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7f0b6efe6e2adb7d6fc5b26af05b2dfe86c974f5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 324/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b4968a2dd5a2d972fef123231737974a9f6a3d4f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 325/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 77b3c7dea580beca38f3529136c6ed93d1471dc9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 326/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From be57489e42571bc78d000f58b5db576be325f870 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 327/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4fc416bc2cd575ea4b6322e8a2d8e78c887c1e92 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 328/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ecbd235c8c9480b05561f32bdf7741baae347a82 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 329/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b1d5e90424324558161cba8456353b9874719092 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 330/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a8e1af98181fa04934187088bc47a8c58fac0b3b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 331/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e310683232458b65e56ce267ce0485ef4a520a19 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 332/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 335cb8d9dd8685d963e988f00c37c527f123bf3b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 333/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b803b5a94b1f12d30d129d89cb8447aae9032469 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 334/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 82e39c248a52e1a9d4bedd4770a0786e4560781a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 335/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 984c2ccfa36896087b36ee4585a9d521e730ad99 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 336/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8fe38c39c82eb0eb1f632d70ad9593771791928e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 337/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4616db482e6ed04d5b4f3a9b938d7d36fc7c7094 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 338/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fba32ef7150cc36b7f37430572922479a0e82c5b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 339/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 186f6f6cde278529dadae3fd4bb94d71facf5140 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 340/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b938d2d4a4518328e234edde39dc796737f57613 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 341/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 65734d4d1cd40d8655bf379c2e590d1b2118ebd2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 342/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cd57890ecaa3cf0696e986f20d95a50b70680afe Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 343/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 72ba855a642f967be273bbb5d5ee35b4737a0a35 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 344/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5e35753e3d72247d94932d8296b4383876486a22 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 345/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e70c4d81a90dd1b39638c1fd67dfd87c041e04d2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 346/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5816ac167f247e477f1a3d779dbbb5c871164feb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 347/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b513becf2e1c5c5ac6cdc67704edce19d936d52f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 348/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 631fcedf06efd592572b2358317ad98c238eddf7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 349/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a9b0f1e99152378a943b7160407bd304ac5f9bfe Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 350/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6b5269e639551e66d501e39644da8f9faaf6034f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 351/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 03a7df4d1e2b5990e627463a9fae5f0952750526 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 352/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 86073c308aa758a7671f4e7696900bcaba0f4088 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 353/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d8b4189aa8f33b9e2c4747e2f27593045a148e2d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 354/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a5bfce3b5dc0a8a96c63690f5a2c386698d45aaa Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 355/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From e1b76c91ff3ce1429468737530f0a15f310c813e Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 356/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 17713988bc656f3bbc0250c633bb1f9f1cdfbf0e Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 357/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From aa456a2ec7e3e14b0ab6058e79d7bc4d295a6693 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 358/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fc894fca36a17508ef744935996d23f3232d2019 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 359/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3b9cfe10d4f1f14a23efe3c411e3e3e661fd41cc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 360/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 43ffed01cc348dda42626a5ef4d1686daf228544 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 361/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f96d1e03fc92575e3bab86fe84df5ac7de2f07d2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 362/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 413355cf21eeb477d8d00acf85d21603d427eec9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 363/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0a6d46fec74988cabbbb5a99e7bb7cbc620153cb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 364/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e0561b2dc1e03e6ab675ca892a56a8f83f678616 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 365/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 72b0e964e8a1872ed11c195d9d034ab16777ce2d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 366/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5ccce6a67de11d2c926294b9d68c952bad957cf4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 367/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6b23194ec37afae261e94344fad17dde0b8639d3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 368/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a9d7fe1458210c40301f346a83cca9b135e24c97 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 369/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 765b13044c27a133f1ff605e10eff8049f3f65b3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 370/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9d2647e787418df1d1f439066d2b37577655ccd4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 371/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2da972ceece28dca1eb370d2b547e43964a82d6a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 372/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6b804b53144891812d25751af2237d6858a52f8f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 373/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a0c5a132d0693fd8c1de7026183da3f1625e1dde Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 374/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fb64c83b1c1f11dc67a8b0ecc2b7565e24c6e2b9 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 375/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ff319fffa8450e8a4983040e47c2bc4b008c241c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 376/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5af9e4b43f4335abd680cfd5029e376c7442558b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 377/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e52ac3e78fa12106b47b294dc16239cd31928c45 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 378/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fb7281d9f205e5ff13c85303a5886983eeb0b321 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 379/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a1edc014a2f9719f346306aadb01afa3c43c79a8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 380/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 62979b2a68a0d3c30c5142459adf434f806aa829 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 381/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0644724d4bfb2610c45db5a09f675bee7f80d0cf Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 382/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e24433e8b6b06d8e0b9ab4918e9b44e62c37b1bd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 383/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bd983a1ecfd58bec5c058913a0f535ceaac3e5da Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 384/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1bd845345e98992ee9c108ca47f0570d450e5f68 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 385/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a6ef9216dcdfcc08fcc9515687e8c2e2ef962319 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 386/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a74597afd48a070cf2508ddb28ca904fece0867f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 387/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 882b6c60577a89a4aa3d892fd9b991537d2f39c0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 388/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6bd6c823aba628b13fc3dd3fe2a1bc7093955ecd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 389/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 60b78677b3142005428e207aacccb5a10b43d850 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 390/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 3b9e0d2a53e39db921ba5b35c710a01d32adc748 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 391/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From aea8534732e06ad6cddecb6ae55905f8b1d7d47b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 392/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 68af5f1e0ee03fc2f629c146d00c8ace4145a35b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 393/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d7dd9546a535331c45f7485c328f41471c5a151c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 394/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 333a1bb7c6ef45513c696fdb675523425fc374b8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 395/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b2a75fe23f7cf06dd62444134abbeb4fa9aa47ca Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 396/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ff0c5e2b840aac9a3afe5a63ff97e4c7ec353e09 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 397/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 10ee9ba391968b1d563b6e5f5b1359c06b1f3586 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 398/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 18908c421f32c5b253023447ffc8b6434e81a84e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 399/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0f8faa51b55b190a79ec7790769b47253e8a13ae Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 400/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c8c808e1560495df87d3ef5cb16605063c81514d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 401/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e3b93a79a7102eecb91a75c8bc9033137a7bac8e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 402/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 787d11f85ca6d61afd24c61520b159023d1db3df Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 403/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 15e7673338ad503b2171c0dbaeafc04dc90318b2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 404/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9d05005ef6e62ca59e62f16aa5556e095dc301bc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 405/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8ab8d055f64cded76d345f5ac4f988b5220c2975 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 406/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ed2d5ebdce6a81140d37d4ea86c5a519efbe6864 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 407/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ab4a0c1d6bf37259d264f31383bced8ee894f4ef Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 408/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0be15990b57b729ba726c53481d2161331a9dc24 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 409/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 68e5527cd925146deaa277b74431bd9a401ca020 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 410/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c87abec0b56561798dedfed18aa119e213fc665f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 411/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 79a38e7737b679a06ba1437f30a9763333149589 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 412/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3a1b16ee3676d8ebad16971547ea1a8100016465 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 413/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1bcc9b28652af9f7fd2ba227b4ad8e01aaf9afdc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 414/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 857d9a87568c6b7434a0fd0eba7039fa3f220d18 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 415/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a40dc47e4b66ad947c7b9cdb6c4d4fa2affb9734 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 416/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2c2ee18e40a4056e965e23db0924a448c5a3aee2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 417/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d120cdf488ef3c2b56ab9330124ec6f189cb5216 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 418/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 11407c8f56fc04b6f681dc88ccb987d0972e9f6a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 419/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 812dabb9778cc564ab45db5a8650a6f92417e8a7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 420/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e5eeb2a9b5310ebe684bb565f99074c7a439d97b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 421/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0aed002122cbe104f40bb4e935f1192545fbd94a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 422/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From bc19bd2712e8ab23c7fc4fa3ea743bc1d6144ed6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 423/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 48fea7e29f2ae77ad962ca87e67c19b1d0eab68a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 424/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From e67952e2126c66bf7107799e4c8b7573683e69e5 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 425/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1a5ee10193d2e70d0b9641d0235447708a990875 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 426/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d64ce75f9fbd409886dbab4eff5b63f09685ee8c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 427/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 341f1d63f0355e9008b3177b18c0403fed9c231a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 428/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b4a946c224f56a8fcc30993c728087a8fdfc7e9c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 429/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9165125125ab58872b2a6ca9ec13742187180a62 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 430/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 67954833e65a4e6ead159d2c07721d32a855cec2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 431/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 41043efbfbf1f9090ffb49e86c25388daa967477 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 432/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6305548f929130ae6ddf967b56e3eccb853ad6c7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 433/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From de5e78156c04f638796fafb2e66be6b450120574 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 434/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8e3af19d58ffe32226472260caf39bc3d13b5847 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 435/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85594c4e0b913c24cee4c2f735e9bc680a8148d6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 436/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b93b4532316a86849e910308a4ff734278776be2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 437/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 696fe67c6045410c0224bad4519a2cdc43624c4d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 438/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 093aab6fb4c1b3eaf50acf5d0f49901423adb7f8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 439/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cb5aaabce5ca9060b388a9c57c75c72d22bab8eb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 440/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b2801352ec424ded29e8bd6629858ccd95dfa1e1 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 441/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3676aad9a0c53da9a8a27fea1ae6f1c5ded37cb3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 442/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 292e54e327d5e8fb4041b91faff6e478ae372b6c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 443/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From faea7323b79701898cd7fd45cbbb194454341ed8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 444/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4e01069b75d5f82ade87a13bd4bfecefd2cee05c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 445/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 92aa13f864961b177ea5004148183793e1c90d3a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 446/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From eb6c72c5774ce645a44564c7e2e7efb2f9b9546a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 447/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cc33edf95ac0666e58f8fab84528a55471597869 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 448/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f07a1e48e09d387c43267bc9aeb8b45a4ff6af1c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 449/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fa0af3de7b66f6cf451d86f10cc94a1504caaf79 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 450/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9e656d3e5e71f1707da8f5330b01ddaff7fb818e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 451/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 38d8e39b7b8f9d39c3439c73641c41b5c8910f92 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 452/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0a6b408ace9033d5785f80fe644bb897b1a342a7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 453/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 34e19691a8f553e5e7f71c68d8984d6abd607947 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 454/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5fd45b2b0584e15be9194acbb095184cbecc07a6 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 455/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fe1111eb4698712256d0918e88d5d7fa97b2dd3f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 456/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9f2aa322a950320c325d18f48da800a62eb50fd6 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 457/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From a2ac06d03c90a14b38b3587acbc78341cbdbeb1c Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 458/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 23c2525036d1c9fb27164760fd5089c5e47a6a3c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 459/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 327792783cd821d96d90a60140dd61d542b10a62 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 460/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 69319f1252aa263226525d95228b0834105deded Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 461/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7581bc4a11c2074687c31cf8fef244d38b1273fe Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 462/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1b0c767e4d36b987e65c9342d57a6e7a93d9fcf4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 463/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c5ca586f49638df97a917d54ddc108055294ef42 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 464/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6d7111f7c902427f37793dc90c663b808fead2bd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 465/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5370fe52aeae2ab64dee5fd6ec35a5bb7aa8c16f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 466/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 06306a308a9af493272bd685f26fddfefd0d3423 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 467/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 934dfcb9756f24ae46d241322680c7453dc18d6b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 468/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 35eb7b8cb80e2879382d636e9be5b0cebf2c3651 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 469/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a75479edb6d781923dbb4ced8ab7fc6a327b9938 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 470/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8d927f7046fcfcff6b470fc448c439c150489b15 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 471/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e57ad45e635771fe01909fe6c1181b27c238d2de Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 472/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7b8156eb66d2b029b70980fa5ac5fe0dad549d02 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 473/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d36791f1d850790de286d83f87bb4695b9cab1c2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 474/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2320a59c6a8fc7f4b3503362be232846b3ce51d2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 475/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 129c3384bbf71472c333e3bf474d7846f9fe521e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 476/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2ced5fc1ccb93105c004bebacc13a3c3abb27f13 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 477/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 55905be3a49fcd76949a141219d2af03a1c661a2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 478/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 49c7ac432f1a3476aa706b896744453c8e0a8299 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 479/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6334a86ee163353fe63cc3c4c434ae70214e8078 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 480/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 655b66d8202628e264d9f68dc4e6e2d4805c72c1 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 481/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0daaf52f8f1b7234f3c00f99e0d684cbd09aeaa0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 482/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 70fad58371fed9a62ebf222dd4562eb8b3c9cbb2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 483/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fe1d00b7490def2253a881f81f2897bb1f68d635 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 484/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4c9b95742f7d66085d6959fadca13a2fd4cf7bc7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 485/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 364c44c7d1b4ae5709dbfb7703f9b06beccc66df Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 486/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f8f5c1d3fc7a5ab660c47a21a84579675d836a9d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 487/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d0c926528021dd32993238484f9b7e76179e47c4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 488/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 21a22d9a7223ee439701745c982e0943ee964b42 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 489/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 6f65419deb627d129a4444fe6244146c9dcf1e2d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 490/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1e9cc254736f88f2b3cc4c646d019744743b2240 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 491/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group From 7543c3740972e29e3dba48b78e56244970014159 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 492/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 30ad3746658e..2091e03286c8 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5626,7 +5483,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5648,11 +5505,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5668,11 +5520,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5700,78 +5547,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4720e8d968af75e6175733a5dc13d2c444554404 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 493/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 239 ++++++++++++++++++++- 1 file changed, 233 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index 2091e03286c8..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -4131,6 +4274,8 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` + // Transforms - List of transforms + Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group @@ -5483,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5505,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5520,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5547,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3c13940b6a0a0b01cb5743bd3db8b438bf26f7dc Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 494/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7f346833bd4e2cc3f36224b1eab4986e6bf98c8d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 495/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From faf1d026ed39a9e799c63382000f0c0545f2d7e7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 496/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85cd448841796ded47558c3bf809a07ad7f34dbb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 497/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5f36ed411810b054472a60ce561878e60b0fc9e0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 498/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 447a637d04c6b9fad4829e044f2e8ff4e2f9b13c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 499/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 190a1f6ec4b40b531d10867564643c77d0476b75 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 500/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 121d7589c431a82862864adbf279026c9bf48e02 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 501/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fb63f27fc0c0e693ee7fa784e581f9506a7c8e8d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 502/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1d660d8c46d29e5dd625dfd269e99d574a5c63b0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 503/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8d1900dafab930bf912346f31e82966628d76ffb Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 504/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c6dd5d72070977d2d49d9da721c5a80c7fd0f792 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 505/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0e8bccd57c23bcbba68b465008125066831ae8a7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 506/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d183804a75fbad2d01e408211110f1f64e7a0d84 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 507/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 81aab8891e602deaab5f1f0ade02cd8e50e8046f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 508/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From cee70fe5c8e3c67c566d60b88e4fcb3386097f3b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 509/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 75933c77d230071a898dde4fafc883ccf683e957 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 510/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 2410ec725644d55c44f7b3d2b03c8c762ecd8b32 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 511/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8cb8c399e6a5163fe73341cb2bcdf989d98c5ed4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 512/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3f1269c4b521b739e69b357f1347216b11d449c0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 513/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b39c761d38d01ed511d3ec9ce101890cfb34653f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 514/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5bc030be2f96da06906cbf83c70ffb8ecc274eb2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 515/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a380fc98517ed398faf9f4474cc7c765b6314c37 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 516/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From a2e51e93d525be0d46cbf967200025ed22c9fe3a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 517/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From c5b1bf07fdfdd4be4e4fab9f6cad1a8db2f83d14 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 518/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f09f90faa817e5a3b9e4edded19022a259334000 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 519/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From d2156d51720098b65c95ed023b5fd4650db0de63 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 520/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1c6d70c6652849823868a981d3be1a2c16cd63b3 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 521/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From fc81057cd85e7169e6af097f49752ce6dc0aa200 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 522/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9c70b0d1040b0d681b486c847b8925a6212e5a57 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 523/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ad29e509f1a5c7df1684d79d3b7f83f4349534c9 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 12:40:18 -0700 Subject: [PATCH 524/558] Add Go 1.13 to CI Updated Linux image to 18.04 Removed travis file. --- azure-pipelines.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ce8e1746eea..1d91c8542593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,30 +1,22 @@ jobs: - - job: Build_Test + - job: BuildAndTest strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' - GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' - GOROOT: '/usr/local/go$(go.version)' - Win_Go112: - vm.image: 'windows-2019' - go.version: '1.12' - GOROOT: 'c:\go$(go.version)' - Win_Go113: - vm.image: 'windows-2019' - go.version: '1.13' - GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: + GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -42,22 +34,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - go get -u golang.org/x/lint/golint + $(GO) get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: go vet $(go list ./... | grep -v vendor) + - script: $(GO) vet $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: go build -v $(go list ./... | grep -v vendor) + - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -65,14 +57,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - golint ./storage/... >&2 - golint ./tools/... >&2 + $(GOROOT)/bin/golint ./storage/... >&2 + $(GOROOT)/bin/golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 4f82a1f3b2083589469601a346e0649d52473911 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Wed, 16 Oct 2019 13:14:35 -0700 Subject: [PATCH 525/558] add windows builds and refactor --- azure-pipelines.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d91c8542593..5ce8e1746eea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,30 @@ jobs: - - job: BuildAndTest + - job: Build_Test strategy: matrix: Linux_Go112: vm.image: 'ubuntu-18.04' go.version: '1.12' + GOROOT: '/usr/local/go$(go.version)' Linux_Go113: vm.image: 'ubuntu-18.04' go.version: '1.13' + GOROOT: '/usr/local/go$(go.version)' + Win_Go112: + vm.image: 'windows-2019' + go.version: '1.12' + GOROOT: 'c:\go$(go.version)' + Win_Go113: + vm.image: 'windows-2019' + go.version: '1.13' + GOROOT: 'c:\go$(go.version)' pool: vmImage: $(vm.image) variables: - GOROOT: '/usr/local/go$(go.version)' GOPATH: '$(system.defaultWorkingDirectory)/work' sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' - GO: '$(GOROOT)/bin/go' IGNORE_BREAKING_CHANGES: true steps: @@ -34,22 +42,22 @@ jobs: set -e curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh dep ensure -v - $(GO) get -u golang.org/x/lint/golint + go get -u golang.org/x/lint/golint workingDirectory: '$(sdkPath)' displayName: 'Install Dependencies' - - script: $(GO) vet $($(GO) list ./... | grep -v vendor) + - script: go vet $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Vet' - - script: $(GO) build -v $($(GO) list ./... | grep -v vendor) + - script: go build -v $(go list ./... | grep -v vendor) workingDirectory: '$(sdkPath)' displayName: 'Build' - - script: $(GO) test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + - script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) workingDirectory: '$(sdkPath)' displayName: 'Run Tests' - - script: $(GO) run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + - script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES workingDirectory: '$(sdkPath)' displayName: 'Display Breaking Changes' - - script: $(GO) run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + - script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt workingDirectory: '$(sdkPath)' displayName: 'Verify Package Directory' - script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 @@ -57,14 +65,14 @@ jobs: displayName: 'Copyright Header Check' failOnStderr: true condition: succeededOrFailed() - - script: $(GOROOT)/bin/gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + - script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 workingDirectory: '$(sdkPath)' displayName: 'Format Check' failOnStderr: true condition: succeededOrFailed() - script: | - $(GOROOT)/bin/golint ./storage/... >&2 - $(GOROOT)/bin/golint ./tools/... >&2 + golint ./storage/... >&2 + golint ./tools/... >&2 workingDirectory: '$(sdkPath)' displayName: 'Linter Check' failOnStderr: true From 74e1b174173673568060338f52ac6f9a2ff74a89 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 526/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 06a2ce860cf954ab8c26910fda894f5f6e794d34 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 527/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 296be2f565bae9abde30f8bb8fe453096b0e932a Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 528/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 51122d5388113bde5c2fdf75c898013901538611 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 529/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 578edbc2a912f1a780a649ceeb7b50aed3fe5d42 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 530/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 85eab23a3f4c987cf48a5ec73e32acd0fffcde1e Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 531/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 95f22038b3154d0e63890ac6388813966ec5cfc4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 532/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ad9003e270a9933f991e97396f62c4859fefab98 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 533/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From e6a3d028e2cbd370f85d9dc62a35a6981b76a7d0 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 534/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ed04209efcb29fbd3b3c55e40405db83852ce63d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 535/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 0325f3d673aab775a0f8e371e549fcd4914b7364 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 536/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From b5e3dc077d2297f022bd3531290cf4d483d4d855 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 537/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 3eb1235c2c7531b65d2c5c7ec5481297a1657533 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 538/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9655185f29f6c5b68b52904795bec05a47833f4f Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 539/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f597592a391731bcf47b4284a342b8bf50dda73d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 540/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From f4a292cf7eb8913d376b091bee0b8205d388b3bd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 541/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 17a123cfe5dd2ed709c359647abe8b4d22879c57 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 542/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 1d744b91446c02b36ac8c5753c33c2c522c50910 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 543/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 51e1d8b0f6c0e6d551beb4cabb9e2a47149dab4b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 544/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 973dca6359533f6a200a59c77b6e5f728e5fe651 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 545/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 589bb7fd637bce2a4c9c0996848f9552c00433a4 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 546/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7ed0dbd5974552f4c5a4f719b72af3ffb4ee007d Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 547/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 313a1d4b2c14edea94e27cf29795ab726d670b00 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 548/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4424b3f667631273859ff2af2543b70f27ad8c84 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 549/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7fa78b0a5da67c87cb0784f3ef360b9671d98285 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 550/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 5eed3c5f2726ec7dbd7f07c4098703aa68456a6b Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 551/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 4001774754dac8f830cd41b39ea8c7eab3aa6d93 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 552/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 9c16ccd8e40c3fabdb0777a10ec4a3e69edd7065 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 553/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From ff33a87f3a59dd753d3698aa46e69f01eaf48d31 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 554/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 7b29f48fbabca9847b1d797d6e21de665886cc2c Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 555/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8a4f6382fd9217f6d93e550884cce17a1aa72fcd Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 00:33:19 +0000 Subject: [PATCH 556/558] [AutoPR cdn/mgmt/2019-04-15] change default version to be 2019-04 (#383) * Generated from 1a79008999e2ba592d4438a0b2a22095090a05b9 change default version to be 2019-04 * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 +-------------------- 1 file changed, 6 insertions(+), 231 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..cc8595f4d081 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,8 +313,6 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -323,13 +321,11 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} } // OptimizationType enumerates the values for optimization type. @@ -433,25 +429,6 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } -// QueryStringBehavior enumerates the values for query string behavior. -type QueryStringBehavior string - -const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" -) - -// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. -func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} -} - // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -776,15 +753,6 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } -// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` - // QueryParameters - query parameters to include or exclude (comma separated). - QueryParameters *string `json:"queryParameters,omitempty"` -} - // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1473,17 +1441,15 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) - AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) - AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1499,10 +1465,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLRewrite): - var ura URLRewriteAction - err := json.Unmarshal(body, &ura) - return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1515,10 +1477,6 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): - var drckqsa DeliveryRuleCacheKeyQueryStringAction - err := json.Unmarshal(body, &drckqsa) - return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1559,11 +1517,6 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1579,11 +1532,6 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. -func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1598,7 +1546,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1620,11 +1568,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1640,11 +1583,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. -func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1655,67 +1593,6 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } -// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. -type DeliveryRuleCacheKeyQueryStringAction struct { - // Parameters - Defines the parameters for the action. - Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString - objectMap := make(map[string]interface{}) - if drckqsa.Parameters != nil { - objectMap["parameters"] = drckqsa.Parameters - } - if drckqsa.Name != "" { - objectMap["name"] = drckqsa.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return &drckqsa, true -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. -func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &drckqsa, true -} - // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2631,7 +2508,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2653,11 +2530,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2673,11 +2545,6 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. -func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -3096,7 +2963,7 @@ 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', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3118,11 +2985,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3138,11 +3000,6 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. -func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5628,7 +5485,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5650,11 +5507,6 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return nil, false -} - // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5670,11 +5522,6 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. -func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5702,78 +5549,6 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } -// URLRewriteAction defines the url rewrite action for the delivery rule. -type URLRewriteAction struct { - // Parameters - Defines the parameters for the action. - Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' - Name NameBasicDeliveryRuleAction `json:"name,omitempty"` -} - -// MarshalJSON is the custom marshaler for URLRewriteAction. -func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite - objectMap := make(map[string]interface{}) - if ura.Parameters != nil { - objectMap["parameters"] = ura.Parameters - } - if ura.Name != "" { - objectMap["name"] = ura.Name - } - return json.Marshal(objectMap) -} - -// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { - return nil, false -} - -// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { - return &ura, true -} - -// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { - return nil, false -} - -// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { - return nil, false -} - -// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { - return nil, false -} - -// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. -func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { - return &ura, true -} - -// URLRewriteActionParameters defines the parameters for the url rewrite action. -type URLRewriteActionParameters struct { - OdataType *string `json:"@odata.type,omitempty"` - // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. - SourcePattern *string `json:"sourcePattern,omitempty"` - // Destination - Define the relative URL to which the above requests will be rewritten by. - Destination *string `json:"destination,omitempty"` - // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. - PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` -} - // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From 8290b76e51236606dceaa67b71227d497bbf4fe7 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 11:21:52 +0000 Subject: [PATCH 557/558] [AutoPR cdn/mgmt/2019-04-15] Add two match condition for CDN RulesEngine. (#467) * Generated from 0ce67b311a2c58faeee1f54bad56afdacc51adeb remove transfrom from HttpVersion condition * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 237 ++++++++++++++++++++- 1 file changed, 231 insertions(+), 6 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index cc8595f4d081..e95aab371da2 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -313,6 +313,8 @@ type NameBasicDeliveryRuleAction string const ( // NameCacheExpiration ... NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameCacheKeyQueryString ... + NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" // NameDeliveryRuleAction ... NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" // NameModifyRequestHeader ... @@ -321,11 +323,13 @@ const ( NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" // NameURLRedirect ... NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameURLRewrite ... + NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect} + return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameURLRedirect, NameURLRewrite} } // OptimizationType enumerates the values for optimization type. @@ -429,6 +433,25 @@ func PossibleProtocolTypeValues() []ProtocolType { return []ProtocolType{IPBased, ServerNameIndication} } +// QueryStringBehavior enumerates the values for query string behavior. +type QueryStringBehavior string + +const ( + // Exclude ... + Exclude QueryStringBehavior = "Exclude" + // ExcludeAll ... + ExcludeAll QueryStringBehavior = "ExcludeAll" + // Include ... + Include QueryStringBehavior = "Include" + // IncludeAll ... + IncludeAll QueryStringBehavior = "IncludeAll" +) + +// PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. +func PossibleQueryStringBehaviorValues() []QueryStringBehavior { + return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} +} + // QueryStringCachingBehavior enumerates the values for query string caching behavior. type QueryStringCachingBehavior string @@ -753,6 +776,15 @@ type CacheExpirationActionParameters struct { CacheDuration *string `json:"cacheDuration,omitempty"` } +// 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 QueryStringBehavior `json:"queryStringBehavior,omitempty"` + // QueryParameters - query parameters to include or exclude (comma separated). + QueryParameters *string `json:"queryParameters,omitempty"` +} + // CertificateSourceParameters defines the parameters for using CDN managed certificate for securing custom // domain. type CertificateSourceParameters struct { @@ -1441,15 +1473,17 @@ func (dr *DeliveryRule) UnmarshalJSON(body []byte) error { // BasicDeliveryRuleAction an action for the delivery rule. type BasicDeliveryRuleAction interface { AsURLRedirectAction() (*URLRedirectAction, bool) + AsURLRewriteAction() (*URLRewriteAction, bool) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) + AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) } // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1465,6 +1499,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err + case string(NameURLRewrite): + var ura URLRewriteAction + err := json.Unmarshal(body, &ura) + return ura, err case string(NameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) @@ -1477,6 +1515,10 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err + case string(NameCacheKeyQueryString): + var drckqsa DeliveryRuleCacheKeyQueryStringAction + err := json.Unmarshal(body, &drckqsa) + return drckqsa, err default: var dra DeliveryRuleAction err := json.Unmarshal(body, &dra) @@ -1517,6 +1559,11 @@ func (dra DeliveryRuleAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1532,6 +1579,11 @@ func (dra DeliveryRuleAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRu return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. +func (dra DeliveryRuleAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleAction. func (dra DeliveryRuleAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return &dra, true @@ -1546,7 +1598,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -1568,6 +1620,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsURLRedirectAction() (*URLRedire return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -1583,6 +1640,11 @@ func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheExpirationActi return &drcea, true } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. +func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -1593,6 +1655,67 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi return &drcea, true } +// DeliveryRuleCacheKeyQueryStringAction defines the cache-key query string action for the delivery rule. +type DeliveryRuleCacheKeyQueryStringAction struct { + // Parameters - Defines the parameters for the action. + Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { + drckqsa.Name = NameCacheKeyQueryString + objectMap := make(map[string]interface{}) + if drckqsa.Parameters != nil { + objectMap["parameters"] = drckqsa.Parameters + } + if drckqsa.Name != "" { + objectMap["name"] = drckqsa.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return &drckqsa, true +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleCacheKeyQueryStringAction. +func (drckqsa DeliveryRuleCacheKeyQueryStringAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &drckqsa, true +} + // BasicDeliveryRuleCondition a condition for the delivery rule. type BasicDeliveryRuleCondition interface { AsDeliveryRuleRemoteAddressCondition() (*DeliveryRuleRemoteAddressCondition, bool) @@ -2508,7 +2631,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2530,6 +2653,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsURLRedirectAction() (*URLRedirect return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return &drrha, true @@ -2545,6 +2673,11 @@ func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheExpirationAction return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. +func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -2963,7 +3096,7 @@ 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', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -2985,6 +3118,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsURLRedirectAction() (*URLRedirec return nil, false } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -3000,6 +3138,11 @@ func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheExpirationActio return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. +func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5485,7 +5628,7 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration' + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -5507,6 +5650,11 @@ func (ura URLRedirectAction) AsURLRedirectAction() (*URLRedirectAction, bool) { return &ura, true } +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return nil, false +} + // AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { return nil, false @@ -5522,6 +5670,11 @@ func (ura URLRedirectAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRul return nil, false } +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. +func (ura URLRedirectAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + // AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRedirectAction. func (ura URLRedirectAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { return nil, false @@ -5549,6 +5702,78 @@ type URLRedirectActionParameters struct { CustomFragment *string `json:"customFragment,omitempty"` } +// URLRewriteAction defines the url rewrite action for the delivery rule. +type URLRewriteAction struct { + // Parameters - Defines the parameters for the action. + Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` + // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + Name NameBasicDeliveryRuleAction `json:"name,omitempty"` +} + +// MarshalJSON is the custom marshaler for URLRewriteAction. +func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { + ura.Name = NameURLRewrite + objectMap := make(map[string]interface{}) + if ura.Parameters != nil { + objectMap["parameters"] = ura.Parameters + } + if ura.Name != "" { + objectMap["name"] = ura.Name + } + return json.Marshal(objectMap) +} + +// AsURLRedirectAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRedirectAction() (*URLRedirectAction, bool) { + return nil, false +} + +// AsURLRewriteAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsURLRewriteAction() (*URLRewriteAction, bool) { + return &ura, true +} + +// AsDeliveryRuleRequestHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleRequestHeaderAction() (*DeliveryRuleRequestHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleResponseHeaderAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleResponseHeaderAction() (*DeliveryRuleResponseHeaderAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheExpirationAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheExpirationAction() (*DeliveryRuleCacheExpirationAction, bool) { + return nil, false +} + +// AsDeliveryRuleCacheKeyQueryStringAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleCacheKeyQueryStringAction() (*DeliveryRuleCacheKeyQueryStringAction, bool) { + return nil, false +} + +// AsDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsDeliveryRuleAction() (*DeliveryRuleAction, bool) { + return nil, false +} + +// AsBasicDeliveryRuleAction is the BasicDeliveryRuleAction implementation for URLRewriteAction. +func (ura URLRewriteAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction, bool) { + return &ura, true +} + +// URLRewriteActionParameters defines the parameters for the url rewrite action. +type URLRewriteActionParameters struct { + OdataType *string `json:"@odata.type,omitempty"` + // SourcePattern - define a request URI pattern that identifies the type of requests that may be rewritten. If value is blank, all strings are matched. + SourcePattern *string `json:"sourcePattern,omitempty"` + // Destination - Define the relative URL to which the above requests will be rewritten by. + Destination *string `json:"destination,omitempty"` + // PreserveUnmatchedPath - Whether to preserve unmatched path. Default value is true. + PreserveUnmatchedPath *bool `json:"preserveUnmatchedPath,omitempty"` +} + // UserManagedHTTPSParameters defines the certificate source parameters using user's keyvault certificate // for enabling SSL. type UserManagedHTTPSParameters struct { From dc8c39566e9430935dd756838e8ceca10b759d66 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:08:50 +0000 Subject: [PATCH 558/558] [AutoPR cdn/mgmt/2019-04-15] [CDN] Add missing customHttpsParameters field of CustomDomainProperties. (#627) * Generated from 4484694befa2b70e10844ced63fb9a92a4f1c587 Add minimumTLSVersion field to CustomDomainHttpsParameters in latest CDN API * Modifications after running after_scripts --- services/cdn/mgmt/2019-04-15/cdn/models.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/cdn/mgmt/2019-04-15/cdn/models.go b/services/cdn/mgmt/2019-04-15/cdn/models.go index e95aab371da2..30ad3746658e 100644 --- a/services/cdn/mgmt/2019-04-15/cdn/models.go +++ b/services/cdn/mgmt/2019-04-15/cdn/models.go @@ -4274,8 +4274,6 @@ type HTTPVersionMatchConditionParameters struct { NegateCondition *bool `json:"negateCondition,omitempty"` // MatchValues - The match value for the condition of the delivery rule MatchValues *[]string `json:"matchValues,omitempty"` - // Transforms - List of transforms - Transforms *[]Transform `json:"transforms,omitempty"` } // IPAddressGroup CDN Ip address group